Update provider/data.rs from the deltachat-provider-db repo

Update provider/update.py according to the struct Provider changes
ci: stop using deprecated Ubuntu 18.04
2026-10-18 10:53:07 +03:00 · 2023-02-21 11:03:49 -03:00 · 2023-02-21 10:53:15 -03:00 · 2023-02-21 13:10:12 +00:00 · 2023-02-21 13:36:36 +01:00 · 2023-02-21 12:21:17 +00:00
71 changed files with 1559 additions and 1377 deletions
@@ -5,22 +5,22 @@ mergeable:
    validate:
      - do: or
        validate:
-        - do: description
-          must_include:
-            regex: '#skip-changelog'
-        - do: and
-          validate:
-            - do: dependent
-              changed:
-                file: 'src/**'
-                required: ['CHANGELOG.md']
-            - do: dependent
-              changed:
-                file: 'deltachat-ffi/src/**'
-                required: ['CHANGELOG.md']
+          - do: description
+            must_include:
+              regex: "#skip-changelog"
+          - do: and
+            validate:
+              - do: dependent
+                changed:
+                  file: "src/**"
+                  required: ["CHANGELOG.md"]
+              - do: dependent
+                changed:
+                  file: "deltachat-ffi/src/**"
+                  required: ["CHANGELOG.md"]
    fail:
      - do: checks
-        status: 'action_required' 
+        status: "action_required"
        payload:
          title: Changelog might need an update
          summary: "Check if CHANGELOG.md needs an update or add #skip-changelog to the PR description."
@@ -8,28 +8,22 @@ on:

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

  docs:
@@ -69,73 +63,73 @@ jobs:
            python: 3.7
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@master
+      - uses: actions/checkout@master

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

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

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

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

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

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

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

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

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

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

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

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

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

-    - name: Run pypy tests
-      if: ${{ matrix.python }}
-      env:
-        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-        DCC_RS_TARGET: debug
-        DCC_RS_DEV: ${{ github.workspace }}
-      working-directory: python
-      run: tox -e pypy3
+      - name: Run pypy tests
+        if: ${{ matrix.python }}
+        env:
+          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+          DCC_RS_TARGET: debug
+          DCC_RS_DEV: ${{ github.workspace }}
+        working-directory: python
+        run: tox -e pypy3
@@ -1,16 +1,15 @@
-name: 'jsonrpc js client build'
+name: "jsonrpc js client build"
 on:
  pull_request:
  push:
    tags:
-    - '*'
-    - '!py-*'
-
+      - "*"
+      - "!py-*"

 jobs:
  pack-module:
-    name: 'Package @deltachat/jsonrpc-client and upload to download.delta.chat'
-    runs-on: ubuntu-18.04
+    name: "Package @deltachat/jsonrpc-client and upload to download.delta.chat"
+    runs-on: ubuntu-20.04
    steps:
      - name: Install tree
        run: sudo apt install tree
@@ -18,7 +17,7 @@ jobs:
        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: "16"
      - name: Get tag
        id: tag
        uses: dawidd6/action-get-tag@v1
@@ -69,9 +68,9 @@ jobs:
        if: steps.upload-preview.outcome == 'success'
        run: node ./node/scripts/postLinksToDetails.js
        env:
-         URL: preview/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-         MSG_CONTEXT: Download the deltachat-jsonrpc-client.tgz
+          URL: preview/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MSG_CONTEXT: Download the deltachat-jsonrpc-client.tgz
      # Upload to download.delta.chat/node/
      - name: Upload deltachat-jsonrpc-client build to download.delta.chat/node/
        if: ${{ steps.tag.outputs.tag }}
@@ -35,6 +35,10 @@ jobs:
          npm run test
        env:
          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+      - name: make sure websocket server version still builds
+        run: |
+          cd deltachat-jsonrpc
+          cargo build --bin deltachat-jsonrpc-server --features webserver
      - name: Run linter
        run: |
          cd deltachat-jsonrpc/typescript
@@ -7,26 +7,25 @@ on:

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

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

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

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

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

 jobs:
  prebuild:
@@ -13,13 +12,13 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: "16"
      - name: System info
        run: |
          rustc -vV
@@ -66,7 +65,7 @@ jobs:
  pack-module:
    needs: prebuild
    name: Package deltachat-node and upload to download.delta.chat
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Install tree
        run: sudo apt install tree
@@ -74,7 +73,7 @@ jobs:
        uses: actions/checkout@v3
      - uses: actions/setup-node@v2
        with:
-          node-version: '16'
+          node-version: "16"
      - name: Get tag
        id: tag
        uses: dawidd6/action-get-tag@v1
@@ -100,7 +99,7 @@ jobs:
      - name: Download Ubuntu prebuild
        uses: actions/download-artifact@v1
        with:
-          name: ubuntu-18.04
+          name: ubuntu-20.04
      - name: Download macOS prebuild
        uses: actions/download-artifact@v1
        with:
@@ -112,11 +111,11 @@ jobs:
      - shell: bash
        run: |
          mkdir node/prebuilds
-          tar -xvzf ubuntu-18.04/ubuntu-18.04.tar.gz -C node/prebuilds
+          tar -xvzf ubuntu-20.04/ubuntu-20.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
+          rm -rf ubuntu-20.04 macos-latest windows-latest
      - name: Install dependencies without running scripts
        run: |
          npm install --ignore-scripts
@@ -152,8 +151,8 @@ jobs:
        if: steps.upload-preview.outcome == 'success'
        run: node ./node/scripts/postLinksToDetails.js
        env:
-         URL: preview/${{ env.DELTACHAT_NODE_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          URL: preview/${{ env.DELTACHAT_NODE_TAR_GZ }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      # Upload to download.delta.chat/node/
      - name: Upload deltachat-node build to download.delta.chat/node/
        if: ${{ steps.tag.outputs.tag }}
@@ -1,4 +1,4 @@
-name: 'node.js tests'
+name: "node.js tests"
 on:
  pull_request:
  push:
@@ -13,13 +13,13 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: "16"
      - name: System info
        run: |
          rustc -vV
@@ -59,7 +59,7 @@ jobs:
          npm run test
        env:
          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-          NODE_OPTIONS: '--force-node-api-uncaught-exceptions-policy=true'
+          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"
      - name: Run tests on Windows, except lint
        timeout-minutes: 10
        if: runner.os == 'Windows'
@@ -68,4 +68,4 @@ jobs:
          npm run test:mocha
        env:
          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-          NODE_OPTIONS: '--force-node-api-uncaught-exceptions-policy=true'
+          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"
@@ -11,13 +11,13 @@ jobs:
    name: Build REPL example
    runs-on: windows-latest
    steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3

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

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

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

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

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

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

 ## Unreleased

+### Changes
+- use transaction in `Contact::add_or_lookup()` #4059
+- Organize the connection pool as a stack rather than a queue to ensure that
+  connection page cache is reused more often.
+  This speeds up tests by 28%, real usage will have lower speedup. #4065
+- Use transaction in `update_blocked_mailinglist_contacts`. #4058
+- Remove `Sql.get_conn()` interface in favor of `.call()` and `.transaction()`. #4055
+
+### Fixes
+- Start SQL transactions with IMMEDIATE behaviour rather than default DEFERRED one. #4063
+- Fix a problem with Gmail where (auto-)deleted messages would get archived instead of deleted.
+  Move them to the Trash folder for Gmail which auto-deletes trashed messages in 30 days #3972
+- Clear config cache after backup import. This bug sometimes resulted in the import to seemingly work at first. #4067
+
+### API-Changes
+
+
+## 1.109.0
+
 ### Changes
 - deltachat-rpc-client: use `dataclass` for `Account`, `Chat`, `Contact` and `Message` #4042
- python: mark bindings as supporting typing according to PEP 561 #4045
- retry filesystem operations during account migration #4043
- remove `r2d2_sqlite` dependency #4050

 ### Fixes
 - deltachat-rpc-server: do not block stdin while processing the request. #4041
  deltachat-rpc-server now reads the next request as soon as previous request handler is spawned.
- enable `auto_vacuum` on all SQL connections #2955
+- Enable `auto_vacuum` on all SQL connections. #2955
+- Replace `r2d2` connection pool with an own implementation. #4050 #4053 #4043 #4061
+  This change improves reliability
+  by closing all database connections immediately when the context is closed.

 ### API-Changes

 - Remove `MimeMessage::from_bytes()` public interface. #4033
 - BREAKING Types: jsonrpc: `get_messages` now returns a map with `MessageLoadResult` instead of failing completely if one of the requested messages could not be loaded. #4038
+- Add `dc_msg_set_subject()`. C-FFI #4057
+- Mark python bindings as supporting typing according to PEP 561 #4045


 ## 1.108.0
@@ -239,7 +239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
 dependencies = [
 "async-trait",
- "axum-core 0.2.9",
+ "axum-core",
 "base64 0.13.1",
 "bitflags",
 "bytes",
@@ -248,7 +248,7 @@ dependencies = [
 "http-body",
 "hyper",
 "itoa",
- "matchit 0.5.0",
+ "matchit",
 "memchr",
 "mime",
 "percent-encoding",
@@ -259,43 +259,7 @@ dependencies = [
 "sha-1",
 "sync_wrapper",
 "tokio",
- "tokio-tungstenite 0.17.2",
- "tower",
- "tower-http",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc"
-dependencies = [
- "async-trait",
- "axum-core 0.3.2",
- "base64 0.20.0",
- "bitflags",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "itoa",
- "matchit 0.7.0",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sha1",
- "sync_wrapper",
- "tokio",
- "tokio-tungstenite 0.18.0",
+ "tokio-tungstenite",
 "tower",
 "tower-http",
 "tower-layer",
@@ -318,23 +282,6 @@ dependencies = [
 "tower-service",
 ]

-[[package]]
-name = "axum-core"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.67"
@@ -368,12 +315,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

-[[package]]
-name = "base64"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
-
 [[package]]
 name = "base64"
 version = "0.21.0"
@@ -893,7 +834,7 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"

 [[package]]
 name = "deltachat"
-version = "1.108.0"
+version = "1.109.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -928,13 +869,13 @@ dependencies = [
 "num-traits",
 "num_cpus",
 "once_cell",
+ "parking_lot",
 "percent-encoding",
 "pgp",
 "pretty_env_logger",
 "proptest",
 "qrcodegen",
 "quick-xml",
- "r2d2",
 "rand 0.8.5",
 "ratelimit",
 "regex",
@@ -965,11 +906,11 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.108.0"
+version = "1.109.0"
 dependencies = [
 "anyhow",
 "async-channel",
- "axum 0.6.4",
+ "axum",
 "deltachat",
 "env_logger 0.10.0",
 "futures",
@@ -987,7 +928,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.108.0"
+version = "1.109.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1002,7 +943,7 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.108.0"
+version = "1.109.0"
 dependencies = [
 "anyhow",
 "deltachat-jsonrpc",
@@ -1025,7 +966,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.108.0"
+version = "1.109.0"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -2158,12 +2099,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"

-[[package]]
-name = "matchit"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
-
 [[package]]
 name = "md-5"
 version = "0.10.5"
@@ -2795,17 +2730,6 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20f14e071918cbeefc5edc986a7aa92c425dae244e003a35e1cdddb5ca39b5cb"

-[[package]]
-name = "r2d2"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
-dependencies = [
- "log",
- "parking_lot",
- "scheduled-thread-pool",
-]
-
 [[package]]
 name = "radix_trie"
 version = "0.2.1"
@@ -3171,15 +3095,6 @@ dependencies = [
 "windows-sys 0.36.1",
 ]

-[[package]]
-name = "scheduled-thread-pool"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"
-dependencies = [
- "parking_lot",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -3240,15 +3155,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_path_to_error"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_spanned"
 version = "0.6.1"
@@ -3658,19 +3564,7 @@ dependencies = [
 "futures-util",
 "log",
 "tokio",
- "tungstenite 0.17.3",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.18.0",
+ "tungstenite",
 ]

 [[package]]
@@ -3880,25 +3774,6 @@ dependencies = [
 "utf-8",
 ]

-[[package]]
-name = "tungstenite"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788"
-dependencies = [
- "base64 0.13.1",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "twofish"
 version = "0.7.1"
@@ -4359,7 +4234,7 @@ dependencies = [
 "async-channel",
 "async-mutex",
 "async-trait",
- "axum 0.5.17",
+ "axum",
 "futures",
 "futures-util",
 "log",
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.108.0"
+version = "1.109.0"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.63"
@@ -29,12 +29,11 @@ format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }

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

 [dev-dependencies]
 ansi_term = "0.12.0"
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.108.0"
+version = "1.109.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -4327,6 +4327,18 @@ void            dc_msg_set_text               (dc_msg_t* msg, const char* text);
 void            dc_msg_set_html               (dc_msg_t* msg, const char* html);


+/**
+ * Sets the email's subject. If it's empty, a default subject
+ * will be used (e.g. `Message from Alice` or `Re: <last subject>`).
+ * This does not alter any information in the database.
+ *
+ * @memberof dc_msg_t
+ * @param msg The message object.
+ * @param subject The new subject.
+ */
+void            dc_msg_set_subject            (dc_msg_t* msg, const char* subject);
+
+
 /**
 * Set different sender name for a message.
 * This overrides the name set by the dc_set_config()-option `displayname`.
@@ -2003,12 +2003,10 @@ pub unsafe extern "C" fn dc_create_contact(
    let ctx = &*context;
    let name = to_string_lossy(name);

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

 #[no_mangle]
@@ -3598,6 +3596,16 @@ pub unsafe extern "C" fn dc_msg_set_html(msg: *mut dc_msg_t, html: *const libc::
    ffi_msg.message.set_html(to_opt_string_lossy(html))
 }

+#[no_mangle]
+pub unsafe extern "C" fn dc_msg_set_subject(msg: *mut dc_msg_t, subject: *const libc::c_char) {
+    if msg.is_null() {
+        eprintln!("ignoring careless call to dc_msg_get_subject()");
+        return;
+    }
+    let ffi_msg = &mut *msg;
+    ffi_msg.message.set_subject(to_string_lossy(subject));
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_set_override_sender_name(
    msg: *mut dc_msg_t,
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.108.0"
+version = "1.109.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -28,7 +28,7 @@ sanitize-filename = "0.4"
 walkdir = "2.3.2"

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

 [dev-dependencies]
@@ -14,7 +14,7 @@
    "c8": "^7.10.0",
    "chai": "^4.3.4",
    "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.14.11",
+    "esbuild": "^0.17.9",
    "http-server": "^14.1.1",
    "mocha": "^9.1.1",
    "node-fetch": "^2.6.1",
@@ -24,13 +24,20 @@
    "typescript": "^4.5.5",
    "ws": "^8.5.0"
  },
+  "exports": {
+    ".": {
+      "require": "./dist/deltachat.cjs",
+      "import": "./dist/deltachat.js"
+    }
+  },
  "license": "MPL-2.0",
  "main": "dist/deltachat.js",
  "name": "@deltachat/jsonrpc-client",
  "scripts": {
-    "build": "run-s generate-bindings extract-constants build:tsc build:bundle",
+    "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
    "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
    "build:tsc": "tsc",
+    "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
    "docs": "typedoc --out docs deltachat.ts",
    "example": "run-s build example:build example:start",
    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
@@ -48,5 +55,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.108.0"
+  "version": "1.109.0"
 }
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.108.0"
+version = "1.109.0"
 edition = "2021"

 [dependencies]
@@ -25,7 +25,35 @@ deltachat_rpc_client = [
 line-length = 120

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

 [tool.isort]
@@ -1,15 +1,15 @@
-from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 from dataclasses import dataclass
+from typing import TYPE_CHECKING, List, Optional, Tuple, Union

 from ._utils import AttrDict
 from .chat import Chat
 from .const import ChatlistFlag, ContactFlag, SpecialContactId
 from .contact import Contact
 from .message import Message
-from .rpc import Rpc

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


@dataclass
@@ -20,7 +20,7 @@ class Account:
    id: int

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

    async def wait_for_event(self) -> AttrDict:
@@ -1,16 +1,17 @@
 import calendar
-from datetime import datetime
-from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
 from dataclasses import dataclass
+from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union

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

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


@dataclass
@@ -21,7 +22,7 @@ class Chat:
    id: int

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

    async def delete(self) -> None:
@@ -217,8 +218,8 @@ class Chat:
    async def get_locations(
        self,
        contact: Optional[Contact] = None,
-        timestamp_from: Optional[datetime] = None,
-        timestamp_to: Optional[datetime] = None,
+        timestamp_from: Optional["datetime"] = None,
+        timestamp_to: Optional["datetime"] = None,
    ) -> List[AttrDict]:
        """Get list of location snapshots for the given contact in the given timespan."""
        time_from = calendar.timegm(timestamp_from.utctimetuple()) if timestamp_from else 0
@@ -2,6 +2,7 @@
 import inspect
 import logging
 from typing import (
+    TYPE_CHECKING,
    Callable,
    Coroutine,
    Dict,
@@ -13,8 +14,6 @@ from typing import (
    Union,
 )

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

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

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

    def __init__(
        self,
-        account: Account,
+        account: "Account",
        hooks: Optional[Iterable[Tuple[Callable, Union[type, EventFilter]]]] = None,
        logger: Optional[logging.Logger] = None,
    ) -> None:
@@ -1,12 +1,12 @@
-from typing import TYPE_CHECKING
 from dataclasses import dataclass
+from typing import TYPE_CHECKING

 from ._utils import AttrDict
-from .rpc import Rpc

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


@dataclass
@@ -21,7 +21,7 @@ class Contact:
    id: int

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

    async def block(self) -> None:
@@ -1,8 +1,10 @@
-from typing import Dict, List
+from typing import TYPE_CHECKING, Dict, List

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


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

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

    async def add_account(self) -> Account:
@@ -2,11 +2,13 @@
 import inspect
 import re
 from abc import ABC, abstractmethod
-from typing import Callable, Iterable, Iterator, Optional, Set, Tuple, Union
+from typing import TYPE_CHECKING, Callable, Iterable, Iterator, Optional, Set, Tuple, Union

-from ._utils import AttrDict
 from .const import EventType

+if TYPE_CHECKING:
+    from ._utils import AttrDict
+

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

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

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

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

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

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


@@ -1,13 +1,13 @@
 import json
-from typing import TYPE_CHECKING, Union
 from dataclasses import dataclass
+from typing import TYPE_CHECKING, Union

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

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


@dataclass
@@ -18,7 +18,7 @@ class Message:
    id: int

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

    async def send_reaction(self, *reaction: str):
@@ -1,8 +1,8 @@
+import asyncio
 import json
 import os
 from typing import AsyncGenerator, List, Optional

-import asyncio
 import aiohttp
 import pytest_asyncio

@@ -1,8 +1,7 @@
+import asyncio
 from unittest.mock import MagicMock

 import pytest
-import asyncio
-
 from deltachat_rpc_client import EventType, events
 from deltachat_rpc_client.rpc import JsonRpcError

@@ -1,5 +1,4 @@
 import pytest
-
 from deltachat_rpc_client import EventType


@@ -22,7 +22,7 @@ deps =
 skipsdist = True
 skip_install = True
 deps =
-    ruff
+    ruff==0.0.247
    black
 commands =
    black --check --diff src/ examples/ tests/
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.108.0"
+version = "1.109.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -60,5 +60,5 @@
    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.108.0"
+  "version": "1.109.0"
 }
@@ -207,14 +207,14 @@ class IdleManager:
        return res

    def wait_for_new_message(self, timeout=None) -> bytes:
-        while 1:
+        while True:
            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:
+        while True:
            for item in self.check(timeout=timeout):
                if FETCH in item:
                    self.log(str(item))
@@ -108,7 +108,7 @@ class FFIEventTracker:
        return ev

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

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

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

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

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

    def wait_securejoin_inviter_progress(self, target):
-        while 1:
+        while True:
            event = self.get_matching("DC_EVENT_SECUREJOIN_INVITER_PROGRESS")
            if event.data2 >= target:
                print(f"** SECUREJOINT-INVITER PROGRESS {target}", self.account)
@@ -309,7 +309,7 @@ class ACSetup:
    def wait_one_configured(self, account):
        """wait until this account has successfully configured."""
        if self._account2state[account] == self.CONFIGURING:
-            while 1:
+            while True:
                acc = self._pop_config_success()
                if acc == account:
                    break
@@ -638,7 +638,7 @@ class BotProcess:

    def _run_stdout_thread(self) -> None:
        try:
-            while 1:
+            while True:
                line = self.popen.stdout.readline()
                if not line:
                    break
@@ -659,7 +659,7 @@ class BotProcess:
        for next_pattern in patterns:
            print("+++FNMATCH:", next_pattern)
            ignored = []
-            while 1:
+            while True:
                line = self.stdout_queue.get()
                if line is None:
                    if ignored:
@@ -85,7 +85,7 @@ class ConfigureTracker:
        self._imap_finished.wait()

    def wait_progress(self, data1=None):
-        while 1:
+        while True:
            evdata = self._progress.get()
            if data1 is None or evdata == data1:
                break
@@ -1954,6 +1954,7 @@ def test_immediate_autodelete(acfactory, lp):
    assert msg.text == "hello"

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

    lp.sec("ac2: check that message was autodeleted on server")
@@ -1995,6 +1996,34 @@ def test_delete_multiple_messages(acfactory, lp):
    assert len(ac2.direct_imap.get_all_messages()) == 1


+def test_trash_multiple_messages(acfactory, lp):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac2.set_config("delete_to_trash", "1")
+    chat12 = acfactory.get_accepted_chat(ac1, ac2)
+
+    lp.sec("ac1: sending 3 messages")
+    texts = ["first", "second", "third"]
+    for text in texts:
+        chat12.send_text(text)
+
+    lp.sec("ac2: waiting for all messages on the other side")
+    to_delete = []
+    for text in texts:
+        msg = ac2._evtracker.wait_next_incoming_message()
+        assert msg.text in texts
+        if text != "second":
+            to_delete.append(msg)
+
+    lp.sec("ac2: deleting all messages except second")
+    assert len(to_delete) == len(texts) - 1
+    ac2.delete_messages(to_delete)
+    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+
+    lp.sec("ac2: test that only one message is left")
+    ac2.direct_imap.select_config_folder("inbox")
+    assert len(ac2.direct_imap.get_all_messages()) == 1
+
+
 def test_configure_error_msgs_wrong_pw(acfactory):
    configdict = acfactory.get_next_liveconfig()
    ac1 = acfactory.get_unconfigured_account()
@@ -8,7 +8,7 @@ envlist =

 [testenv]
 commands = 
-    pytest -n6 --extra-info --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
+    pytest -n6 --extra-info -v -rsXx --ignored --strict-tls {posargs: tests examples}
    pip wheel . -w {toxworkdir}/wheelhouse --no-deps
 setenv =
 # Avoid stack overflow when Rust core is built without optimizations.
@@ -21,7 +21,6 @@ passenv =
    RUSTC_WRAPPER
 deps = 
    pytest
-    pytest-rerunfailures
    pytest-timeout
    pytest-xdist
    pdbpp
@@ -1,7 +1,6 @@
 //! # Account manager module.

 use std::collections::BTreeMap;
-use std::future::Future;
 use std::path::{Path, PathBuf};

 use anyhow::{ensure, Context as _, Result};
@@ -151,7 +150,7 @@ impl Accounts {
        if let Some(cfg) = self.config.get_account(id) {
            let account_path = self.dir.join(cfg.dir);

-            try_many_times(|| fs::remove_dir_all(&account_path))
+            fs::remove_dir_all(&account_path)
                .await
                .context("failed to remove account data")?;
        }
@@ -187,10 +186,10 @@ impl Accounts {
            fs::create_dir_all(self.dir.join(&account_config.dir))
                .await
                .context("failed to create dir")?;
-            try_many_times(|| fs::rename(&dbfile, &new_dbfile))
+            fs::rename(&dbfile, &new_dbfile)
                .await
                .context("failed to rename dbfile")?;
-            try_many_times(|| fs::rename(&blobdir, &new_blobdir))
+            fs::rename(&blobdir, &new_blobdir)
                .await
                .context("failed to rename blobdir")?;
            if walfile.exists() {
@@ -215,7 +214,7 @@ impl Accounts {
            }
            Err(err) => {
                let account_path = std::path::PathBuf::from(&account_config.dir);
-                try_many_times(|| fs::remove_dir_all(&account_path))
+                fs::remove_dir_all(&account_path)
                    .await
                    .context("failed to remove account data")?;
                self.config.remove_account(account_config.id).await?;
@@ -472,33 +471,6 @@ impl Config {
    }
 }

-/// Spend up to 1 minute trying to do the operation.
-///
-/// Files may remain locked up to 30 seconds due to r2d2 bug:
-/// <https://github.com/sfackler/r2d2/issues/99>
-async fn try_many_times<F, Fut, T>(f: F) -> std::result::Result<(), T>
-where
-    F: Fn() -> Fut,
-    Fut: Future<Output = std::result::Result<(), T>>,
-{
-    let mut counter = 0;
-    loop {
-        counter += 1;
-
-        if let Err(err) = f().await {
-            if counter > 60 {
-                return Err(err);
-            }
-
-            // Wait 1 second and try again.
-            tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
-        } else {
-            break;
-        }
-    }
-    Ok(())
-}
-
 /// Configuration of a single account.
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 struct AccountConfig {
@@ -907,7 +907,8 @@ impl ChatId {

    async fn parent_query<T, F>(self, context: &Context, fields: &str, f: F) -> Result<Option<T>>
    where
-        F: FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
+        F: Send + FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
+        T: Send + 'static,
    {
        let sql = &context.sql;
        let query = format!(
@@ -3397,7 +3398,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
            msg.param.remove(Param::WebxdcSummaryTimestamp);
            msg.in_reply_to = None;

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

            let new_msg_id: MsgId;
@@ -1,5 +1,7 @@
 //! # Key-value configuration management.

+use std::str::FromStr;
+
 use anyhow::{ensure, Context as _, Result};
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
@@ -173,6 +175,10 @@ pub enum Config {
    #[strum(props(default = "0"))]
    DeleteDeviceAfter,

+    /// Move messages to the Trash folder instead of marking them "\Deleted". Overrides
+    /// `ProviderOptions::delete_to_trash`.
+    DeleteToTrash,
+
    /// Save raw MIME messages with headers in the database if true.
    SaveMimeHeaders,

@@ -227,6 +233,9 @@ pub enum Config {
    /// Configured "Sent" folder.
    ConfiguredSentboxFolder,

+    /// Configured "Trash" folder.
+    ConfiguredTrashFolder,
+
    /// Unix timestamp of the last successful configuration.
    ConfiguredTimestamp,

@@ -327,30 +336,37 @@ impl Context {
        }
    }

-    /// Returns 32-bit signed integer configuration value for the given key.
-    pub async fn get_config_int(&self, key: Config) -> Result<i32> {
+    /// Returns Some(T) if a value for the given key exists and was successfully parsed.
+    /// Returns None if could not parse.
+    pub async fn get_config_parsed<T: FromStr>(&self, key: Config) -> Result<Option<T>> {
        self.get_config(key)
            .await
-            .map(|s: Option<String>| s.and_then(|s| s.parse().ok()).unwrap_or_default())
+            .map(|s: Option<String>| s.and_then(|s| s.parse().ok()))
+    }
+
+    /// Returns 32-bit signed integer configuration value for the given key.
+    pub async fn get_config_int(&self, key: Config) -> Result<i32> {
+        Ok(self.get_config_parsed(key).await?.unwrap_or_default())
    }

    /// Returns 64-bit signed integer configuration value for the given key.
    pub async fn get_config_i64(&self, key: Config) -> Result<i64> {
-        self.get_config(key)
-            .await
-            .map(|s: Option<String>| s.and_then(|s| s.parse().ok()).unwrap_or_default())
+        Ok(self.get_config_parsed(key).await?.unwrap_or_default())
    }

    /// Returns 64-bit unsigned integer configuration value for the given key.
    pub async fn get_config_u64(&self, key: Config) -> Result<u64> {
-        self.get_config(key)
-            .await
-            .map(|s: Option<String>| s.and_then(|s| s.parse().ok()).unwrap_or_default())
+        Ok(self.get_config_parsed(key).await?.unwrap_or_default())
+    }
+
+    /// Returns boolean configuration value (if any) for the given key.
+    pub async fn get_config_bool_opt(&self, key: Config) -> Result<Option<bool>> {
+        Ok(self.get_config_parsed::<i32>(key).await?.map(|x| x != 0))
    }

    /// Returns boolean configuration value for the given key.
    pub async fn get_config_bool(&self, key: Config) -> Result<bool> {
-        Ok(self.get_config_int(key).await? != 0)
+        Ok(self.get_config_bool_opt(key).await?.unwrap_or_default())
    }

    /// Returns true if movebox ("DeltaChat" folder) should be watched.
@@ -550,7 +566,6 @@ fn get_config_keys_string() -> String {

 #[cfg(test)]
 mod tests {
-    use std::str::FromStr;
    use std::string::ToString;

    use num_traits::FromPrimitive;
@@ -249,7 +249,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
                                        }
                                    }
                                },
-                                strict_tls: Some(provider.strict_tls),
+                                strict_tls: Some(provider.opt.strict_tls),
                            })
                            .collect();

@@ -338,7 +338,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
        .collect();
    let provider_strict_tls = param
        .provider
-        .map_or(socks5_config.is_some(), |provider| provider.strict_tls);
+        .map_or(socks5_config.is_some(), |provider| provider.opt.strict_tls);

    let smtp_config_task = task::spawn(async move {
        let mut smtp_configured = false;
@@ -201,7 +201,7 @@ pub const BALANCED_IMAGE_SIZE: u32 = 1280;
 pub const WORSE_IMAGE_SIZE: u32 = 640;

 // this value can be increased if the folder configuration is changed and must be redone on next program start
-pub(crate) const DC_FOLDERS_CONFIGURED_VERSION: i32 = 3;
+pub(crate) const DC_FOLDERS_CONFIGURED_VERSION: i32 = 4;

 #[cfg(test)]
 mod tests {
@@ -13,6 +13,7 @@ use async_channel::{self as channel, Receiver, Sender};
 use deltachat_derive::{FromSql, ToSql};
 use once_cell::sync::Lazy;
 use regex::Regex;
+use rusqlite::OptionalExtension;
 use serde::{Deserialize, Serialize};
 use tokio::task;
 use tokio::time::{timeout, Duration};
@@ -520,8 +521,6 @@ impl Contact {
    /// Depending on the origin, both, "row_name" and "row_authname" are updated from "name".
    ///
    /// Returns the contact_id and a `Modifier` value indicating if a modification occurred.
-    ///
-    /// Returns None if the contact with such address cannot exist.
    pub(crate) async fn add_or_lookup(
        context: &Context,
        name: &str,
@@ -566,14 +565,12 @@ impl Contact {
        );

        let mut update_addr = false;
-        let mut row_id = 0;

-        if let Some((id, row_name, row_addr, row_origin, row_authname)) = context
-            .sql
-            .query_row_optional(
-                "SELECT id, name, addr, origin, authname \
-            FROM contacts WHERE addr=? COLLATE NOCASE;",
-                paramsv![addr.to_string()],
+        let row_id = context.sql.transaction(|transaction| {
+            let row = transaction.query_row(
+                "SELECT id, name, addr, origin, authname
+                 FROM contacts WHERE addr=? COLLATE NOCASE",
+                 [addr.to_string()],
                |row| {
                    let row_id: isize = row.get(0)?;
                    let row_name: String = row.get(1)?;
@@ -582,120 +579,130 @@ impl Contact {
                    let row_authname: String = row.get(4)?;

                    Ok((row_id, row_name, row_addr, row_origin, row_authname))
-                },
-            )
-            .await?
-        {
-            let update_name = manual && name != row_name;
-            let update_authname = !manual
-                && name != row_authname
-                && !name.is_empty()
-                && (origin >= row_origin
-                    || origin == Origin::IncomingUnknownFrom
-                    || row_authname.is_empty());
+                }).optional()?;

-            row_id = u32::try_from(id)?;
-            if origin >= row_origin && addr.as_ref() != row_addr {
-                update_addr = true;
-            }
-            if update_name || update_authname || update_addr || origin > row_origin {
-                let new_name = if update_name {
-                    name.to_string()
-                } else {
-                    row_name
-                };
+            let row_id;
+            if let Some((id, row_name, row_addr, row_origin, row_authname)) = row {
+                let update_name = manual && name != row_name;
+                let update_authname = !manual
+                    && name != row_authname
+                    && !name.is_empty()
+                    && (origin >= row_origin
+                        || origin == Origin::IncomingUnknownFrom
+                        || row_authname.is_empty());

-                context
-                    .sql
-                    .execute(
-                        "UPDATE contacts SET name=?, addr=?, origin=?, authname=? WHERE id=?;",
-                        paramsv![
-                            new_name,
-                            if update_addr {
-                                addr.to_string()
-                            } else {
-                                row_addr
-                            },
-                            if origin > row_origin {
-                                origin
-                            } else {
-                                row_origin
-                            },
-                            if update_authname {
-                                name.to_string()
-                            } else {
-                                row_authname
-                            },
-                            row_id
-                        ],
-                    )
-                    .await
-                    .ok();
+                row_id = u32::try_from(id)?;
+                if origin >= row_origin && addr.as_ref() != row_addr {
+                    update_addr = true;
+                }
+                if update_name || update_authname || update_addr || origin > row_origin {
+                    let new_name = if update_name {
+                        name.to_string()
+                    } else {
+                        row_name
+                    };

-                if update_name || update_authname {
-                    // Update the contact name also if it is used as a group name.
-                    // This is one of the few duplicated data, however, getting the chat list is easier this way.
-                    let chat_id: Option<i32> = context.sql.query_get_value(
-                        "SELECT id FROM chats WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)",
-                        paramsv![Chattype::Single, isize::try_from(row_id)?]
-                    ).await?;
-                    if let Some(chat_id) = chat_id {
-                        let contact = Contact::get_by_id(context, ContactId::new(row_id)).await?;
-                        let chat_name = contact.get_display_name();
-                        match context
-                            .sql
-                            .execute(
-                                "UPDATE chats SET name=?1 WHERE id=?2 AND name!=?3",
-                                paramsv![chat_name, chat_id, chat_name],
-                            )
-                            .await
-                        {
-                            Err(err) => warn!(context, "Can't update chat name: {}", err),
-                            Ok(count) => {
-                                if count > 0 {
-                                    // Chat name updated
-                                    context.emit_event(EventType::ChatModified(ChatId::new(
-                                        chat_id.try_into()?,
-                                    )));
-                                }
+                    transaction
+                        .execute(
+                            "UPDATE contacts SET name=?, addr=?, origin=?, authname=? WHERE id=?;",
+                            paramsv![
+                                new_name,
+                                if update_addr {
+                                    addr.to_string()
+                                } else {
+                                    row_addr
+                                },
+                                if origin > row_origin {
+                                    origin
+                                } else {
+                                    row_origin
+                                },
+                                if update_authname {
+                                    name.to_string()
+                                } else {
+                                    row_authname
+                                },
+                                row_id
+                            ],
+                        )?;
+
+                    if update_name || update_authname {
+                        // Update the contact name also if it is used as a group name.
+                        // This is one of the few duplicated data, however, getting the chat list is easier this way.
+                        let chat_id: Option<ChatId> = transaction.query_row(
+                            "SELECT id FROM chats WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)",
+                            params![Chattype::Single, isize::try_from(row_id)?],
+                            |row| {
+                                let chat_id: ChatId = row.get(0)?;
+                                Ok(chat_id)
+                            }
+                        ).optional()?;
+
+                        if let Some(chat_id) = chat_id {
+                            let contact_id = ContactId::new(row_id);
+                            let (addr, name, authname) =
+                                transaction.query_row(
+                                    "SELECT addr, name, authname
+                                     FROM contacts
+                                     WHERE id=?",
+                                     params![contact_id],
+                                |row| {
+                                    let addr: String = row.get(0)?;
+                                    let name: String = row.get(1)?;
+                                    let authname: String = row.get(2)?;
+                                    Ok((addr, name, authname))
+                                })?;
+
+                            let chat_name = if !name.is_empty() {
+                                name
+                            } else if !authname.is_empty() {
+                                authname
+                            } else {
+                                addr
+                            };
+
+                            let count = transaction.execute(
+                                    "UPDATE chats SET name=?1 WHERE id=?2 AND name!=?1",
+                                    params![chat_name, chat_id])?;
+
+                            if count > 0 {
+                                // Chat name updated
+                                context.emit_event(EventType::ChatModified(chat_id));
                            }
                        }
                    }
+                    sth_modified = Modifier::Modified;
                }
-                sth_modified = Modifier::Modified;
-            }
-        } else {
-            let update_name = manual;
-            let update_authname = !manual;
-
-            if let Ok(new_row_id) = context
-                .sql
-                .insert(
-                    "INSERT INTO contacts (name, addr, origin, authname) VALUES(?, ?, ?, ?);",
-                    paramsv![
-                        if update_name {
-                            name.to_string()
-                        } else {
-                            "".to_string()
-                        },
-                        addr,
-                        origin,
-                        if update_authname {
-                            name.to_string()
-                        } else {
-                            "".to_string()
-                        }
-                    ],
-                )
-                .await
-            {
-                row_id = u32::try_from(new_row_id)?;
-                sth_modified = Modifier::Created;
-                info!(context, "added contact id={} addr={}", row_id, &addr);
            } else {
-                error!(context, "Cannot add contact.");
+                let update_name = manual;
+                let update_authname = !manual;
+
+                transaction
+                    .execute(
+                        "INSERT INTO contacts (name, addr, origin, authname)
+                         VALUES (?, ?, ?, ?);",
+                        params![
+                            if update_name {
+                                name.to_string()
+                            } else {
+                                "".to_string()
+                            },
+                            addr,
+                            origin,
+                            if update_authname {
+                                name.to_string()
+                            } else {
+                                "".to_string()
+                            }
+                        ],
+                    )?;
+
+                sth_modified = Modifier::Created;
+                row_id = u32::try_from(transaction.last_insert_rowid())?;
+                info!(context, "added contact id={} addr={}", row_id, &addr);
            }
-        }
+            Ok(row_id)
+        }).await?;

        Ok((ContactId::new(row_id), sth_modified))
    }
@@ -862,47 +869,45 @@ impl Contact {
        Ok(ret)
    }

-    // add blocked mailinglists as contacts
-    // to allow unblocking them as if they are contacts
-    // (this way, only one unblock-ffi is needed and only one set of ui-functions,
-    // from the users perspective,
-    // there is not much difference in an email- and a mailinglist-address)
+    /// Adds blocked mailinglists as contacts
+    /// to allow unblocking them as if they are contacts
+    /// (this way, only one unblock-ffi is needed and only one set of ui-functions,
+    /// from the users perspective,
+    /// there is not much difference in an email- and a mailinglist-address)
    async fn update_blocked_mailinglist_contacts(context: &Context) -> Result<()> {
-        let blocked_mailinglists = context
+        context
            .sql
-            .query_map(
-                "SELECT name, grpid FROM chats WHERE type=? AND blocked=?;",
-                paramsv![Chattype::Mailinglist, Blocked::Yes],
-                |row| Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?)),
-                |rows| {
-                    rows.collect::<std::result::Result<Vec<_>, _>>()
-                        .map_err(Into::into)
-                },
-            )
+            .transaction(move |transaction| {
+                let mut stmt = transaction
+                    .prepare("SELECT name, grpid FROM chats WHERE type=? AND blocked=?")?;
+                let rows = stmt.query_map(params![Chattype::Mailinglist, Blocked::Yes], |row| {
+                    let name: String = row.get(0)?;
+                    let grpid: String = row.get(1)?;
+                    Ok((name, grpid))
+                })?;
+                let blocked_mailinglists = rows.collect::<std::result::Result<Vec<_>, _>>()?;
+                for (name, grpid) in blocked_mailinglists {
+                    let count = transaction.query_row(
+                        "SELECT COUNT(id) FROM contacts WHERE addr=?",
+                        [&grpid],
+                        |row| {
+                            let count: isize = row.get(0)?;
+                            Ok(count)
+                        },
+                    )?;
+                    if count == 0 {
+                        transaction.execute("INSERT INTO contacts (addr) VALUES (?)", [&grpid])?;
+                    }
+
+                    // Always do an update in case the blocking is reset or name is changed.
+                    transaction.execute(
+                        "UPDATE contacts SET name=?, origin=?, blocked=1 WHERE addr=?",
+                        params![&name, Origin::MailinglistAddress, &grpid],
+                    )?;
+                }
+                Ok(())
+            })
            .await?;
-        for (name, grpid) in blocked_mailinglists {
-            if !context
-                .sql
-                .exists(
-                    "SELECT COUNT(id) FROM contacts WHERE addr=?;",
-                    paramsv![grpid],
-                )
-                .await?
-            {
-                context
-                    .sql
-                    .execute("INSERT INTO contacts (addr) VALUES (?);", paramsv![grpid])
-                    .await?;
-            }
-            // always do an update in case the blocking is reset or name is changed
-            context
-                .sql
-                .execute(
-                    "UPDATE contacts SET name=?, origin=?, blocked=1 WHERE addr=?;",
-                    paramsv![name, Origin::MailinglistAddress, grpid],
-                )
-                .await?;
-        }
        Ok(())
    }

@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::{Duration, Instant, SystemTime};

-use anyhow::{bail, ensure, Result};
+use anyhow::{bail, ensure, Context as _, Result};
 use async_channel::{self as channel, Receiver, Sender};
 use ratelimit::Ratelimit;
 use tokio::sync::{Mutex, RwLock};
@@ -623,6 +623,10 @@ impl Context {
            .get_config(Config::ConfiguredMvboxFolder)
            .await?
            .unwrap_or_else(|| "<unset>".to_string());
+        let configured_trash_folder = self
+            .get_config(Config::ConfiguredTrashFolder)
+            .await?
+            .unwrap_or_else(|| "<unset>".to_string());

        let mut res = get_info();

@@ -689,6 +693,7 @@ impl Context {
        res.insert("configured_inbox_folder", configured_inbox_folder);
        res.insert("configured_sentbox_folder", configured_sentbox_folder);
        res.insert("configured_mvbox_folder", configured_mvbox_folder);
+        res.insert("configured_trash_folder", configured_trash_folder);
        res.insert("mdns_enabled", mdns_enabled.to_string());
        res.insert("e2ee_enabled", e2ee_enabled.to_string());
        res.insert(
@@ -722,6 +727,12 @@ impl Context {
                .await?
                .to_string(),
        );
+        res.insert(
+            "delete_to_trash",
+            self.get_config(Config::DeleteToTrash)
+                .await?
+                .unwrap_or_else(|| "<unset>".to_string()),
+        );
        res.insert(
            "last_housekeeping",
            self.get_config_int(Config::LastHousekeeping)
@@ -887,6 +898,33 @@ impl Context {
        Ok(mvbox.as_deref() == Some(folder_name))
    }

+    /// Returns true if given folder name is the name of the trash folder.
+    pub async fn is_trash(&self, folder_name: &str) -> Result<bool> {
+        let trash = self.get_config(Config::ConfiguredTrashFolder).await?;
+        Ok(trash.as_deref() == Some(folder_name))
+    }
+
+    pub(crate) async fn should_delete_to_trash(&self) -> Result<bool> {
+        if let Some(v) = self.get_config_bool_opt(Config::DeleteToTrash).await? {
+            return Ok(v);
+        }
+        if let Some(provider) = self.get_configured_provider().await? {
+            return Ok(provider.opt.delete_to_trash);
+        }
+        Ok(false)
+    }
+
+    /// Returns `target` for deleted messages as per `imap` table. Empty string means "delete w/o
+    /// moving to trash".
+    pub(crate) async fn get_delete_msgs_target(&self) -> Result<String> {
+        if !self.should_delete_to_trash().await? {
+            return Ok("".into());
+        }
+        self.get_config(Config::ConfiguredTrashFolder)
+            .await?
+            .context("No configured trash folder")
+    }
+
    pub(crate) fn derive_blobdir(dbfile: &Path) -> PathBuf {
        let mut blob_fname = OsString::new();
        blob_fname.push(dbfile.file_name().unwrap_or_default());
@@ -138,7 +138,7 @@ impl Job {
            context
                .sql
                .query_row_optional(
-                    "SELECT uid, folder FROM imap WHERE rfc724_mid=? AND target!=''",
+                    "SELECT uid, folder FROM imap WHERE rfc724_mid=? AND target=folder",
                    paramsv![msg.rfc724_mid],
                    |row| {
                        let server_uid: u32 = row.get(0)?;
@@ -588,19 +588,25 @@ pub(crate) async fn delete_expired_imap_messages(context: &Context) -> Result<()
                now - max(delete_server_after, MIN_DELETE_SERVER_AFTER),
            ),
        };
+    let target = context.get_delete_msgs_target().await?;

    context
        .sql
        .execute(
            "UPDATE imap
-             SET target=''
+             SET target=?
             WHERE rfc724_mid IN (
               SELECT rfc724_mid FROM msgs
               WHERE ((download_state = 0 AND timestamp < ?) OR
                      (download_state != 0 AND timestamp < ?) OR
                      (ephemeral_timestamp != 0 AND ephemeral_timestamp <= ?))
             )",
-            paramsv![threshold_timestamp, threshold_timestamp_extended, now],
+            paramsv![
+                target,
+                threshold_timestamp,
+                threshold_timestamp_extended,
+                now,
+            ],
        )
        .await?;

@@ -113,13 +113,15 @@ impl async_imap::Authenticator for OAuth2 {
    }
 }

-#[derive(Debug, PartialEq, Clone, Copy)]
-enum FolderMeaning {
+#[derive(Debug, Display, PartialEq, Eq, Clone, Copy)]
+pub enum FolderMeaning {
    Unknown,
    Spam,
+    Inbox,
+    Mvbox,
    Sent,
+    Trash,
    Drafts,
-    Other,

    /// Virtual folders.
    ///
@@ -131,13 +133,15 @@ enum FolderMeaning {
 }

 impl FolderMeaning {
-    fn to_config(self) -> Option<Config> {
+    pub fn to_config(self) -> Option<Config> {
        match self {
            FolderMeaning::Unknown => None,
            FolderMeaning::Spam => None,
+            FolderMeaning::Inbox => Some(Config::ConfiguredInboxFolder),
+            FolderMeaning::Mvbox => Some(Config::ConfiguredMvboxFolder),
            FolderMeaning::Sent => Some(Config::ConfiguredSentboxFolder),
+            FolderMeaning::Trash => Some(Config::ConfiguredTrashFolder),
            FolderMeaning::Drafts => None,
-            FolderMeaning::Other => None,
            FolderMeaning::Virtual => None,
        }
    }
@@ -270,7 +274,7 @@ impl Imap {
            param
                .provider
                .map_or(param.socks5_config.is_some(), |provider| {
-                    provider.strict_tls
+                    provider.opt.strict_tls
                }),
            idle_interrupt_receiver,
        )?;
@@ -449,7 +453,7 @@ impl Imap {
        &mut self,
        context: &Context,
        watch_folder: &str,
-        is_spam_folder: bool,
+        folder_meaning: FolderMeaning,
    ) -> Result<()> {
        if !context.sql.is_open().await {
            // probably shutdown
@@ -458,7 +462,7 @@ impl Imap {
        self.prepare(context).await?;

        let msgs_fetched = self
-            .fetch_new_messages(context, watch_folder, is_spam_folder, false)
+            .fetch_new_messages(context, watch_folder, folder_meaning, false)
            .await
            .context("fetch_new_messages")?;
        if msgs_fetched && context.get_config_delete_device_after().await?.is_some() {
@@ -490,49 +494,60 @@ impl Imap {
    pub(crate) async fn resync_folder_uids(
        &mut self,
        context: &Context,
-        folder: String,
+        folder: &str,
+        folder_meaning: FolderMeaning,
    ) -> Result<()> {
        // Collect pairs of UID and Message-ID.
-        let mut msg_ids = BTreeMap::new();
+        let mut msgs = BTreeMap::new();

        let session = self
            .session
            .as_mut()
            .context("IMAP No connection established")?;

-        session.select_folder(context, Some(&folder)).await?;
+        session.select_folder(context, Some(folder)).await?;

        let mut list = session
            .uid_fetch("1:*", RFC724MID_UID)
            .await
            .with_context(|| format!("can't resync folder {folder}"))?;
        while let Some(fetch) = list.next().await {
-            let msg = fetch?;
+            let fetch = fetch?;
+            let headers = match get_fetch_headers(&fetch) {
+                Ok(headers) => headers,
+                Err(err) => {
+                    warn!(context, "Failed to parse FETCH headers: {}", err);
+                    continue;
+                }
+            };
+            let message_id = prefetch_get_message_id(&headers);

-            // Get Message-ID
-            let message_id =
-                get_fetch_headers(&msg).map_or(None, |headers| prefetch_get_message_id(&headers));
-
-            if let (Some(uid), Some(rfc724_mid)) = (msg.uid, message_id) {
-                msg_ids.insert(uid, rfc724_mid);
+            if let (Some(uid), Some(rfc724_mid)) = (fetch.uid, message_id) {
+                msgs.insert(
+                    uid,
+                    (
+                        rfc724_mid,
+                        target_folder(context, folder, folder_meaning, &headers).await?,
+                    ),
+                );
            }
        }

        info!(
            context,
            "Resync: collected {} message IDs in folder {}",
-            msg_ids.len(),
-            &folder
+            msgs.len(),
+            folder,
        );

-        let uid_validity = get_uidvalidity(context, &folder).await?;
+        let uid_validity = get_uidvalidity(context, folder).await?;

        // Write collected UIDs to SQLite database.
        context
            .sql
            .transaction(move |transaction| {
                transaction.execute("DELETE FROM imap WHERE folder=?", params![folder])?;
-                for (uid, rfc724_mid) in &msg_ids {
+                for (uid, (rfc724_mid, target)) in &msgs {
                    // This may detect previously undetected moved
                    // messages, so we update server_folder too.
                    transaction.execute(
@@ -541,7 +556,7 @@ impl Imap {
                         ON CONFLICT(folder, uid, uidvalidity)
                         DO UPDATE SET rfc724_mid=excluded.rfc724_mid,
                                       target=excluded.target",
-                        params![rfc724_mid, folder, uid, uid_validity, folder],
+                        params![rfc724_mid, folder, uid, uid_validity, target],
                    )?;
                }
                Ok(())
@@ -683,10 +698,10 @@ impl Imap {
        &mut self,
        context: &Context,
        folder: &str,
-        is_spam_folder: bool,
+        folder_meaning: FolderMeaning,
        fetch_existing_msgs: bool,
    ) -> Result<bool> {
-        if should_ignore_folder(context, folder, is_spam_folder).await? {
+        if should_ignore_folder(context, folder, folder_meaning).await? {
            info!(context, "Not fetching from {}", folder);
            return Ok(false);
        }
@@ -713,8 +728,6 @@ impl Imap {
        };
        let read_cnt = msgs.len();

-        let show_emails = ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?)
-            .unwrap_or_default();
        let download_limit = context.download_limit().await?;
        let mut uids_fetch = Vec::<(_, bool /* partially? */)>::with_capacity(msgs.len() + 1);
        let mut uid_message_ids = BTreeMap::new();
@@ -732,14 +745,7 @@ impl Imap {

            // Get the Message-ID or generate a fake one to identify the message in the database.
            let message_id = prefetch_get_or_create_message_id(&headers);
-
-            let target = match target_folder(context, folder, is_spam_folder, &headers).await? {
-                Some(config) => match context.get_config(config).await? {
-                    Some(target) => target,
-                    None => folder.to_string(),
-                },
-                None => folder.to_string(),
-            };
+            let target = target_folder(context, folder, folder_meaning, &headers).await?;

            context
                .sql
@@ -763,14 +769,13 @@ impl Imap {
                // Never download messages directly from the spam folder.
                // If the sender is known, the message will be moved to the Inbox or Mvbox
                // and then we download the message from there.
-                // Also see `spam_target_folder()`.
-                && !is_spam_folder
+                // Also see `spam_target_folder_cfg()`.
+                && folder_meaning != FolderMeaning::Spam
                && prefetch_should_download(
                    context,
                    &headers,
                    &message_id,
                    fetch_response.flags(),
-                    show_emails,
                )
                .await.context("prefetch_should_download")?
            {
@@ -870,17 +875,21 @@ impl Imap {
            .context("failed to get recipients from the inbox")?;

        if context.get_config_bool(Config::FetchExistingMsgs).await? {
-            for config in &[
-                Config::ConfiguredMvboxFolder,
-                Config::ConfiguredInboxFolder,
-                Config::ConfiguredSentboxFolder,
+            for meaning in [
+                FolderMeaning::Mvbox,
+                FolderMeaning::Inbox,
+                FolderMeaning::Sent,
            ] {
-                if let Some(folder) = context.get_config(*config).await? {
+                let config = match meaning.to_config() {
+                    Some(c) => c,
+                    None => continue,
+                };
+                if let Some(folder) = context.get_config(config).await? {
                    info!(
                        context,
                        "Fetching existing messages from folder \"{}\"", folder
                    );
-                    self.fetch_new_messages(context, &folder, false, true)
+                    self.fetch_new_messages(context, &folder, meaning, true)
                        .await
                        .context("could not fetch existing messages")?;
                }
@@ -952,44 +961,60 @@ impl Session {
                    return Ok(());
                }
                Err(err) => {
+                    if context.should_delete_to_trash().await? {
+                        error!(
+                            context,
+                            "Cannot move messages {} to {}, no fallback to COPY/DELETE because \
+                            delete_to_trash is set. Error: {:#}",
+                            set,
+                            target,
+                            err,
+                        );
+                        return Err(err.into());
+                    }
                    warn!(
                        context,
-                        "Cannot move message, fallback to COPY/DELETE {} to {}: {}",
+                        "Cannot move messages, fallback to COPY/DELETE {} to {}: {}",
                        set,
                        target,
                        err
                    );
                }
            }
-        } else {
+        }
+
+        // Server does not support MOVE or MOVE failed.
+        // Copy messages to the destination folder if needed and mark records for deletion.
+        let copy = !context.is_trash(target).await?;
+        if copy {
            info!(
                context,
                "Server does not support MOVE, fallback to COPY/DELETE {} to {}", set, target
            );
+            self.uid_copy(&set, &target).await?;
+        } else {
+            error!(
+                context,
+                "Server does not support MOVE, fallback to DELETE {} to {}", set, target,
+            );
        }
-
-        // Server does not support MOVE or MOVE failed.
-        // Copy the message to the destination folder and mark the record for deletion.
-        match self.uid_copy(&set, &target).await {
-            Ok(()) => {
-                context
-                    .sql
-                    .execute(
-                        &format!(
-                            "UPDATE imap SET target='' WHERE id IN ({})",
-                            sql::repeat_vars(row_ids.len())
-                        ),
-                        rusqlite::params_from_iter(row_ids),
-                    )
-                    .await
-                    .context("cannot plan deletion of copied messages")?;
-                context.emit_event(EventType::ImapMessageMoved(format!(
-                    "IMAP messages {set} copied to {target}"
-                )));
-                Ok(())
-            }
-            Err(err) => Err(err.into()),
+        context
+            .sql
+            .execute(
+                &format!(
+                    "UPDATE imap SET target='' WHERE id IN ({})",
+                    sql::repeat_vars(row_ids.len())
+                ),
+                rusqlite::params_from_iter(row_ids),
+            )
+            .await
+            .context("cannot plan deletion of messages")?;
+        if copy {
+            context.emit_event(EventType::ImapMessageMoved(format!(
+                "IMAP messages {set} copied to {target}"
+            )));
        }
+        Ok(())
    }

    /// Moves and deletes messages as planned in the `imap` table.
@@ -1644,7 +1669,7 @@ impl Imap {
                }
            }

-            let folder_meaning = get_folder_meaning(&folder);
+            let folder_meaning = get_folder_meaning_by_attrs(folder.attributes());
            let folder_name_meaning = get_folder_meaning_by_name(folder.name());
            if let Some(config) = folder_meaning.to_config() {
                // Always takes precedence
@@ -1776,7 +1801,7 @@ async fn should_move_out_of_spam(
 /// If this returns None, the message will not be moved out of the
 /// Spam folder, and as `fetch_new_messages()` doesn't download
 /// messages from the Spam folder, the message will be ignored.
-async fn spam_target_folder(
+async fn spam_target_folder_cfg(
    context: &Context,
    headers: &[mailparse::MailHeader<'_>],
 ) -> Result<Option<Config>> {
@@ -1797,18 +1822,18 @@ async fn spam_target_folder(

 /// Returns `ConfiguredInboxFolder`, `ConfiguredMvboxFolder` or `ConfiguredSentboxFolder` if
 /// the message needs to be moved from `folder`. Otherwise returns `None`.
-pub async fn target_folder(
+pub async fn target_folder_cfg(
    context: &Context,
    folder: &str,
-    is_spam_folder: bool,
+    folder_meaning: FolderMeaning,
    headers: &[mailparse::MailHeader<'_>],
 ) -> Result<Option<Config>> {
    if context.is_mvbox(folder).await? {
        return Ok(None);
    }

-    if is_spam_folder {
-        spam_target_folder(context, headers).await
+    if folder_meaning == FolderMeaning::Spam {
+        spam_target_folder_cfg(context, headers).await
    } else if needs_move_to_mvbox(context, headers).await? {
        Ok(Some(Config::ConfiguredMvboxFolder))
    } else {
@@ -1816,6 +1841,21 @@ pub async fn target_folder(
    }
 }

+pub async fn target_folder(
+    context: &Context,
+    folder: &str,
+    folder_meaning: FolderMeaning,
+    headers: &[mailparse::MailHeader<'_>],
+) -> Result<String> {
+    match target_folder_cfg(context, folder, folder_meaning, headers).await? {
+        Some(config) => match context.get_config(config).await? {
+            Some(target) => Ok(target),
+            None => Ok(folder.to_string()),
+        },
+        None => Ok(folder.to_string()),
+    }
+}
+
 async fn needs_move_to_mvbox(
    context: &Context,
    headers: &[mailparse::MailHeader<'_>],
@@ -1940,10 +1980,10 @@ fn get_folder_meaning_by_name(folder_name: &str) -> FolderMeaning {
    }
 }

-fn get_folder_meaning(folder_name: &Name) -> FolderMeaning {
-    for attr in folder_name.attributes() {
+fn get_folder_meaning_by_attrs(folder_attrs: &[NameAttribute]) -> FolderMeaning {
+    for attr in folder_attrs {
        match attr {
-            NameAttribute::Trash => return FolderMeaning::Other,
+            NameAttribute::Trash => return FolderMeaning::Trash,
            NameAttribute::Sent => return FolderMeaning::Sent,
            NameAttribute::Junk => return FolderMeaning::Spam,
            NameAttribute::Drafts => return FolderMeaning::Drafts,
@@ -1961,6 +2001,13 @@ fn get_folder_meaning(folder_name: &Name) -> FolderMeaning {
    FolderMeaning::Unknown
 }

+pub(crate) fn get_folder_meaning(folder: &Name) -> FolderMeaning {
+    match get_folder_meaning_by_attrs(folder.attributes()) {
+        FolderMeaning::Unknown => get_folder_meaning_by_name(folder.name()),
+        meaning => meaning,
+    }
+}
+
 /// Parses the headers from the FETCH result.
 fn get_fetch_headers(prefetch_msg: &Fetch) -> Result<Vec<mailparse::MailHeader>> {
    match prefetch_msg.header() {
@@ -2005,7 +2052,6 @@ pub(crate) async fn prefetch_should_download(
    headers: &[mailparse::MailHeader<'_>],
    message_id: &str,
    mut flags: impl Iterator<Item = Flag<'_>>,
-    show_emails: ShowEmails,
 ) -> Result<bool> {
    if message::rfc724_mid_exists(context, message_id)
        .await?
@@ -2065,6 +2111,9 @@ pub(crate) async fn prefetch_should_download(
        })
        .unwrap_or_default();

+    let show_emails =
+        ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?).unwrap_or_default();
+
    let show = is_autocrypt_setup_message
        || match show_emails {
            ShowEmails::Off => is_chat_message || is_reply_to_chat_message,
@@ -2272,7 +2321,7 @@ pub async fn get_config_last_seen_uid(context: &Context, folder: &str) -> Result
 async fn should_ignore_folder(
    context: &Context,
    folder: &str,
-    is_spam_folder: bool,
+    folder_meaning: FolderMeaning,
 ) -> Result<bool> {
    if !context.get_config_bool(Config::OnlyFetchMvbox).await? {
        return Ok(false);
@@ -2281,7 +2330,7 @@ async fn should_ignore_folder(
        // Still respect the SentboxWatch setting.
        return Ok(!context.get_config_bool(Config::SentboxWatch).await?);
    }
-    Ok(!(context.is_mvbox(folder).await? || is_spam_folder))
+    Ok(!(context.is_mvbox(folder).await? || folder_meaning == FolderMeaning::Spam))
 }

 /// Builds a list of sequence/uid sets. The returned sets have each no more than around 1000
@@ -2564,14 +2613,13 @@ mod tests {
        };

        let (headers, _) = mailparse::parse_headers(bytes)?;
-
-        let is_spam_folder = folder == "Spam";
-        let actual =
-            if let Some(config) = target_folder(&t, folder, is_spam_folder, &headers).await? {
-                t.get_config(config).await?
-            } else {
-                None
-            };
+        let actual = if let Some(config) =
+            target_folder_cfg(&t, folder, get_folder_meaning_by_name(folder), &headers).await?
+        {
+            t.get_config(config).await?
+        } else {
+            None
+        };

        let expected = if expected_destination == folder {
            None
@@ -7,7 +7,7 @@ use futures_lite::FutureExt;

 use super::session::Session;
 use super::Imap;
-use crate::imap::client::IMAP_TIMEOUT;
+use crate::imap::{client::IMAP_TIMEOUT, FolderMeaning};
 use crate::{context::Context, scheduler::InterruptInfo};

 const IDLE_TIMEOUT: Duration = Duration::from_secs(23 * 60);
@@ -113,6 +113,7 @@ impl Imap {
        &mut self,
        context: &Context,
        watch_folder: Option<String>,
+        folder_meaning: FolderMeaning,
    ) -> InterruptInfo {
        // Idle using polling. This is also needed if we're not yet configured -
        // in this case, we're waiting for a configure job (and an interrupt).
@@ -173,7 +174,7 @@ impl Imap {
                    // will have already fetched the messages so perform_*_fetch
                    // will not find any new.
                    match self
-                        .fetch_new_messages(context, &watch_folder, false, false)
+                        .fetch_new_messages(context, &watch_folder, folder_meaning, false)
                        .await
                    {
                        Ok(res) => {
@@ -3,7 +3,7 @@ use std::{collections::BTreeMap, time::Instant};
 use anyhow::{Context as _, Result};
 use futures::stream::StreamExt;

-use super::{get_folder_meaning, get_folder_meaning_by_name};
+use super::{get_folder_meaning_by_attrs, get_folder_meaning_by_name};
 use crate::config::Config;
 use crate::imap::Imap;
 use crate::log::LogExt;
@@ -33,7 +33,7 @@ impl Imap {
        let mut folder_configs = BTreeMap::new();

        for folder in folders {
-            let folder_meaning = get_folder_meaning(&folder);
+            let folder_meaning = get_folder_meaning_by_attrs(folder.attributes());
            if folder_meaning == FolderMeaning::Virtual {
                // Gmail has virtual folders that should be skipped. For example,
                // emails appear in the inbox and under "All Mail" as soon as it is
@@ -53,21 +53,22 @@ impl Imap {
                    .or_insert_with(|| folder.name().to_string());
            }

-            let is_drafts = folder_meaning == FolderMeaning::Drafts
-                || (folder_meaning == FolderMeaning::Unknown
-                    && folder_name_meaning == FolderMeaning::Drafts);
-            let is_spam_folder = folder_meaning == FolderMeaning::Spam
-                || (folder_meaning == FolderMeaning::Unknown
-                    && folder_name_meaning == FolderMeaning::Spam);
+            let folder_meaning = match folder_meaning {
+                FolderMeaning::Unknown => folder_name_meaning,
+                _ => folder_meaning,
+            };

            // Don't scan folders that are watched anyway
-            if !watched_folders.contains(&folder.name().to_string()) && !is_drafts {
+            if !watched_folders.contains(&folder.name().to_string())
+                && folder_meaning != FolderMeaning::Drafts
+                && folder_meaning != FolderMeaning::Trash
+            {
                let session = self.session.as_mut().context("no session")?;
                // Drain leftover unsolicited EXISTS messages
                session.server_sent_unsolicited_exists(context)?;

                loop {
-                    self.fetch_move_delete(context, folder.name(), is_spam_folder)
+                    self.fetch_move_delete(context, folder.name(), folder_meaning)
                        .await
                        .ok_or_log_msg(context, "Can't fetch new msgs in scanned folder");

@@ -80,15 +81,15 @@ impl Imap {
            }
        }

-        // Set the `ConfiguredSentboxFolder` or set it to `None` if the folder was deleted.
-        context
-            .set_config(
-                Config::ConfiguredSentboxFolder,
-                folder_configs
-                    .get(&Config::ConfiguredSentboxFolder)
-                    .map(|s| s.as_str()),
-            )
-            .await?;
+        // Set configs for necessary folders. Or reset if the folder was deleted.
+        for conf in [
+            Config::ConfiguredSentboxFolder,
+            Config::ConfiguredTrashFolder,
+        ] {
+            context
+                .set_config(conf, folder_configs.get(&conf).map(|s| s.as_str()))
+                .await?;
+        }

        last_scan.replace(Instant::now());
        Ok(true)
@@ -5,7 +5,7 @@ use std::ffi::OsStr;
 use std::path::{Path, PathBuf};

 use ::pgp::types::KeyTrait;
-use anyhow::{bail, ensure, format_err, Context as _, Result};
+use anyhow::{bail, ensure, format_err, Context as _, Error, Result};
 use futures::StreamExt;
 use futures_lite::FutureExt;
 use rand::{thread_rng, Rng};
@@ -427,8 +427,6 @@ async fn import_backup(
        context.get_dbfile().display()
    );

-    context.sql.config_cache.write().await.clear();
-
    let mut archive = Archive::new(backup_file);

    let mut entries = archive.entries()?;
@@ -508,6 +506,9 @@ fn get_next_backup_path(folder: &Path, backup_time: i64) -> Result<(PathBuf, Pat
    bail!("could not create backup file, disk full?");
 }

+/// Exports the database to a separate file with the given passphrase.
+///
+/// Set passphrase to empty string to export the database unencrypted.
 async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Result<()> {
    // get a fine backup file name (the name includes the date so that multiple backup instances are possible)
    let now = time();
@@ -521,13 +522,6 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
        .await?;
    sql::housekeeping(context).await.ok_or_log(context);

-    context
-        .sql
-        .execute("VACUUM;", paramsv![])
-        .await
-        .map_err(|e| warn!(context, "Vacuum failed, exporting anyway {}", e))
-        .ok();
-
    ensure!(
        context.scheduler.read().await.is_none(),
        "cannot export backup, IO is running"
@@ -540,11 +534,31 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
        dest_path.display(),
    );

+    let path_str = temp_db_path
+        .to_str()
+        .with_context(|| format!("path {temp_db_path:?} is not valid unicode"))?;
+
    context
        .sql
-        .export(&temp_db_path, passphrase)
-        .await
-        .with_context(|| format!("failed to backup plaintext database to {temp_db_path:?}"))?;
+        .call(|conn| {
+            if let Err(err) = conn.execute("VACUUM", params![]) {
+                info!(context, "Vacuum failed, exporting anyway: {:#}.", err);
+            }
+            conn.execute(
+                "ATTACH DATABASE ? AS backup KEY ?",
+                paramsv![path_str, passphrase],
+            )
+            .context("failed to attach backup database")?;
+            let res = conn
+                .query_row("SELECT sqlcipher_export('backup')", [], |_row| Ok(()))
+                .context("failed to export to attached backup database");
+            conn.execute("DETACH DATABASE backup", [])
+                .context("failed to detach backup database")?;
+            res?;
+
+            Ok::<_, Error>(())
+        })
+        .await?;

    let res = export_backup_inner(context, &temp_db_path, &temp_path).await;

@@ -769,7 +783,10 @@ where

 #[cfg(test)]
 mod tests {
+    use std::time::Duration;
+
    use ::pgp::armor::BlockType;
+    use tokio::task;

    use super::*;
    use crate::pgp::{split_armored_data, HEADER_AUTOCRYPT, HEADER_SETUPCODE};
@@ -917,6 +934,46 @@ mod tests {
        Ok(())
    }

+    /// This is a regression test for
+    /// https://github.com/deltachat/deltachat-android/issues/2263
+    /// where the config cache wasn't reset properly after a backup.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_import_backup_reset_config_cache() -> Result<()> {
+        let backup_dir = tempfile::tempdir()?;
+        let context1 = TestContext::new_alice().await;
+        let context2 = TestContext::new().await;
+        assert!(!context2.is_configured().await?);
+
+        // export from context1
+        imex(&context1, ImexMode::ExportBackup, backup_dir.path(), None).await?;
+
+        // import to context2
+        let backup = has_backup(&context2, backup_dir.path()).await?;
+        let context2_cloned = context2.clone();
+        let handle = task::spawn(async move {
+            imex(
+                &context2_cloned,
+                ImexMode::ImportBackup,
+                backup.as_ref(),
+                None,
+            )
+            .await
+            .unwrap();
+        });
+
+        while !handle.is_finished() {
+            // The database is still unconfigured;
+            // fill the config cache with the old value.
+            context2.is_configured().await.ok();
+            tokio::time::sleep(Duration::from_micros(1)).await;
+        }
+
+        // Assert that the config cache has the new value now.
+        assert!(context2.is_configured().await?);
+
+        Ok(())
+    }
+
    #[test]
    fn test_normalize_setup_code() {
        let norm = normalize_setup_code("123422343234423452346234723482349234");
@@ -12,7 +12,7 @@ use deltachat_derive::{FromSql, ToSql};
 use rand::{thread_rng, Rng};

 use crate::context::Context;
-use crate::imap::Imap;
+use crate::imap::{get_folder_meaning, FolderMeaning, Imap};
 use crate::param::Params;
 use crate::scheduler::InterruptInfo;
 use crate::tools::time;
@@ -172,8 +172,12 @@ impl Job {
        let mut any_failed = false;

        for folder in all_folders {
+            let folder_meaning = get_folder_meaning(&folder);
+            if folder_meaning == FolderMeaning::Virtual {
+                continue;
+            }
            if let Err(e) = imap
-                .resync_folder_uids(context, folder.name().to_string())
+                .resync_folder_uids(context, folder.name(), folder_meaning)
                .await
            {
                warn!(context, "{:#}", e);
@@ -289,39 +289,41 @@ pub async fn store_self_keypair(
    keypair: &KeyPair,
    default: KeyPairUse,
 ) -> Result<()> {
-    let mut conn = context.sql.get_conn().await?;
-    let transaction = conn.transaction()?;
+    context
+        .sql
+        .transaction(|transaction| {
+            let public_key = DcKey::to_bytes(&keypair.public);
+            let secret_key = DcKey::to_bytes(&keypair.secret);
+            transaction
+                .execute(
+                    "DELETE FROM keypairs WHERE public_key=? OR private_key=?;",
+                    paramsv![public_key, secret_key],
+                )
+                .context("failed to remove old use of key")?;
+            if default == KeyPairUse::Default {
+                transaction
+                    .execute("UPDATE keypairs SET is_default=0;", paramsv![])
+                    .context("failed to clear default")?;
+            }
+            let is_default = match default {
+                KeyPairUse::Default => i32::from(true),
+                KeyPairUse::ReadOnly => i32::from(false),
+            };

-    let public_key = DcKey::to_bytes(&keypair.public);
-    let secret_key = DcKey::to_bytes(&keypair.secret);
-    transaction
-        .execute(
-            "DELETE FROM keypairs WHERE public_key=? OR private_key=?;",
-            paramsv![public_key, secret_key],
-        )
-        .context("failed to remove old use of key")?;
-    if default == KeyPairUse::Default {
-        transaction
-            .execute("UPDATE keypairs SET is_default=0;", paramsv![])
-            .context("failed to clear default")?;
-    }
-    let is_default = match default {
-        KeyPairUse::Default => i32::from(true),
-        KeyPairUse::ReadOnly => i32::from(false),
-    };
+            let addr = keypair.addr.to_string();
+            let t = time();

-    let addr = keypair.addr.to_string();
-    let t = time();
-
-    transaction
-        .execute(
-            "INSERT INTO keypairs (addr, is_default, public_key, private_key, created)
+            transaction
+                .execute(
+                    "INSERT INTO keypairs (addr, is_default, public_key, private_key, created)
                VALUES (?,?,?,?,?);",
-            paramsv![addr, is_default, public_key, secret_key, t],
-        )
-        .context("failed to insert keypair")?;
+                    paramsv![addr, is_default, public_key, secret_key, t],
+                )
+                .context("failed to insert keypair")?;

-    transaction.commit()?;
+            Ok(())
+        })
+        .await?;

    Ok(())
 }
@@ -601,32 +601,38 @@ pub(crate) async fn save(
            ..
        } = location;

-        let conn = context.sql.get_conn().await?;
-        let mut stmt_test =
-            conn.prepare_cached("SELECT id FROM locations WHERE timestamp=? AND from_id=?")?;
-        let mut stmt_insert = conn.prepare_cached(stmt_insert)?;
+        context
+            .sql
+            .call(|conn| {
+                let mut stmt_test = conn
+                    .prepare_cached("SELECT id FROM locations WHERE timestamp=? AND from_id=?")?;
+                let mut stmt_insert = conn.prepare_cached(stmt_insert)?;

-        let exists = stmt_test.exists(paramsv![timestamp, contact_id])?;
+                let exists = stmt_test.exists(paramsv![timestamp, contact_id])?;

-        if independent || !exists {
-            stmt_insert.execute(paramsv![
-                timestamp,
-                contact_id,
-                chat_id,
-                latitude,
-                longitude,
-                accuracy,
-                independent,
-            ])?;
+                if independent || !exists {
+                    stmt_insert.execute(paramsv![
+                        timestamp,
+                        contact_id,
+                        chat_id,
+                        latitude,
+                        longitude,
+                        accuracy,
+                        independent,
+                    ])?;

-            if timestamp > newest_timestamp {
-                // okay to drop, as we use cached prepared statements
-                drop(stmt_test);
-                drop(stmt_insert);
-                newest_timestamp = timestamp;
-                newest_location_id = Some(u32::try_from(conn.last_insert_rowid())?);
-            }
-        }
+                    if timestamp > newest_timestamp {
+                        // okay to drop, as we use cached prepared statements
+                        drop(stmt_test);
+                        drop(stmt_insert);
+                        newest_timestamp = timestamp;
+                        newest_location_id = Some(u32::try_from(conn.last_insert_rowid())?);
+                    }
+                }
+
+                Ok(())
+            })
+            .await?;
    }

    Ok(newest_location_id)
@@ -265,6 +265,8 @@ pub struct Message {
    pub(crate) text: Option<String>,

    /// Message subject.
+    ///
+    /// If empty, a default subject will be generated when sending.
    pub(crate) subject: String,

    /// `Message-ID` header value.
@@ -795,6 +797,12 @@ impl Message {
        self.text = text;
    }

+    /// Sets the email's subject. If it's empty, a default subject
+    /// will be used (e.g. `Message from Alice` or `Re: <last subject>`).
+    pub fn set_subject(&mut self, subject: String) {
+        self.subject = subject;
+    }
+
    /// Sets the file associated with a message.
    ///
    /// This function does not use the file or check if it exists,
@@ -1378,11 +1386,12 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
            context.emit_event(EventType::WebxdcInstanceDeleted { msg_id: *msg_id });
        }

+        let target = context.get_delete_msgs_target().await?;
        context
            .sql
            .execute(
-                "UPDATE imap SET target='' WHERE rfc724_mid=?",
-                paramsv![msg.rfc724_mid],
+                "UPDATE imap SET target=? WHERE rfc724_mid=?",
+                paramsv![target, msg.rfc724_mid],
            )
            .await?;

@@ -1612,6 +1612,22 @@ mod tests {
        assert_eq!(maybe_encode_words("äöü"), "=?utf-8?b?w6TDtsO8?=");
    }

+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_manually_set_subject() -> Result<()> {
+        let t = TestContext::new_alice().await;
+        let chat = t.create_chat_with_contact("bob", "bob@example.org").await;
+
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_subject("Subjeeeeect".to_string());
+
+        let sent_msg = t.send_msg(chat.id, &mut msg).await;
+        let payload = sent_msg.payload();
+
+        assert_eq!(payload.match_indices("Subject: Subjeeeeect").count(), 1);
+
+        Ok(())
+    }
+
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_subject_from_mua() {
        // 1.: Receive a mail from an MUA
@@ -186,7 +186,7 @@ impl Peerstate {
    async fn from_stmt(
        context: &Context,
        query: &str,
-        params: impl rusqlite::Params,
+        params: impl rusqlite::Params + Send,
    ) -> Result<Option<Peerstate>> {
        let peerstate = context
            .sql
@@ -129,6 +129,16 @@ pub struct Provider {
    /// Default configuration values to set when provider is configured.
    pub config_defaults: Option<Vec<ConfigDefault>>,

+    /// Type of OAuth 2 authorization if provider supports it.
+    pub oauth2_authorizer: Option<Oauth2Authorizer>,
+
+    /// Options with good defaults.
+    pub opt: ProviderOptions,
+}
+
+/// Provider options with good defaults.
+#[derive(Debug, PartialEq, Eq)]
+pub struct ProviderOptions {
    /// True if provider is known to use use proper,
    /// not self-signed certificates.
    pub strict_tls: bool,
@@ -136,8 +146,18 @@ pub struct Provider {
    /// Maximum number of recipients the provider allows to send a single email to.
    pub max_smtp_rcpt_to: Option<u16>,

-    /// Type of OAuth 2 authorization if provider supports it.
-    pub oauth2_authorizer: Option<Oauth2Authorizer>,
+    /// Move messages to the Trash folder instead of marking them "\Deleted".
+    pub delete_to_trash: bool,
+}
+
+impl Default for ProviderOptions {
+    fn default() -> Self {
+        Self {
+            strict_tls: true,
+            max_smtp_rcpt_to: None,
+            delete_to_trash: false,
+        }
+    }
 }

 /// Get resolver to query MX records.
@@ -1,13 +1,14 @@
 // file generated by src/provider/update.py

-use std::collections::HashMap;
-
-use once_cell::sync::Lazy;
-
 use crate::provider::Protocol::*;
 use crate::provider::Socket::*;
 use crate::provider::UsernamePattern::*;
-use crate::provider::{Config, ConfigDefault, Oauth2Authorizer, Provider, Server, Status};
+use crate::provider::{
+    Config, ConfigDefault, Oauth2Authorizer, Provider, ProviderOptions, Server, Status,
+};
+use std::collections::HashMap;
+
+use once_cell::sync::Lazy;

 // 163.md: 163.com
 static P_163: Lazy<Provider> = Lazy::new(|| Provider {
@@ -32,9 +33,8 @@ static P_163: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -61,9 +61,8 @@ static P_AKTIVIX_ORG: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -79,9 +78,8 @@ static P_AOL: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Ssl, hostname: "imap.aol.com", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.aol.com", port: 465, username_pattern: Email },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -109,9 +107,8 @@ static P_ARCOR_DE: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -138,9 +135,8 @@ static P_AUTISTICI_ORG: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -167,9 +163,8 @@ static P_BLINDZELN_ORG: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -196,9 +191,8 @@ static P_BLUEWIN_CH: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -225,9 +219,8 @@ static P_BUZON_UY: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -254,9 +247,8 @@ static P_CHELLO_AT: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -268,9 +260,8 @@ static P_COMCAST: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/comcast",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -282,9 +273,8 @@ static P_DISMAIL_DE: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/dismail-de",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -311,9 +301,8 @@ static P_DISROOT: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -340,9 +329,8 @@ static P_E_EMAIL: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -354,9 +342,8 @@ static P_ESPIV_NET: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/espiv-net",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -372,9 +359,8 @@ static P_EXAMPLE_COM: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Ssl, hostname: "imap.example.com", port: 1337, username_pattern: Email },
        Server { protocol: Smtp, socket: Starttls, hostname: "smtp.example.com", port: 1337, username_pattern: Email },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -403,9 +389,8 @@ static P_FASTMAIL: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -419,9 +404,8 @@ static P_FIREMAIL_DE: Lazy<Provider> = Lazy::new(|| {
    overview_page: "https://providers.delta.chat/firemail-de",
    server: vec![
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -434,6 +418,7 @@ static P_FIVE_CHAT: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/five-chat",
    server: vec![],
+    opt: Default::default(),
    config_defaults: Some(vec![
        ConfigDefault {
            key: Config::BccSelf,
@@ -448,8 +433,6 @@ static P_FIVE_CHAT: Lazy<Provider> = Lazy::new(|| Provider {
            value: "0",
        },
    ]),
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -465,9 +448,8 @@ static P_FREENET_DE: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Ssl, hostname: "mx.freenet.de", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Starttls, hostname: "mx.freenet.de", port: 587, username_pattern: Email },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -484,9 +466,11 @@ static P_GMAIL: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Ssl, hostname: "imap.gmail.com", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.gmail.com", port: 465, username_pattern: Email },
    ],
+    opt: ProviderOptions {
+        delete_to_trash: true,
+        ..Default::default()
+    },
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: Some(Oauth2Authorizer::Gmail),
 }
 });
@@ -521,9 +505,8 @@ static P_GMX_NET: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -535,6 +518,10 @@ static P_HERMES_RADIO: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/hermes-radio",
    server: vec![],
+    opt: ProviderOptions {
+        strict_tls: false,
+        ..Default::default()
+    },
    config_defaults: Some(vec![
        ConfigDefault {
            key: Config::MdnsEnabled,
@@ -549,8 +536,6 @@ static P_HERMES_RADIO: Lazy<Provider> = Lazy::new(|| Provider {
            value: "2",
        },
    ]),
-    strict_tls: false,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -564,9 +549,8 @@ static P_HEY_COM: Lazy<Provider> = Lazy::new(|| {
    overview_page: "https://providers.delta.chat/hey-com",
    server: vec![
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -579,9 +563,8 @@ static P_I_UA: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/i-ua",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -593,9 +576,8 @@ static P_I3_NET: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/i3-net",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -622,9 +604,8 @@ static P_ICLOUD: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -651,9 +632,11 @@ static P_INFOMANIAK_COM: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: ProviderOptions {
+        max_smtp_rcpt_to: Some(10),
+        ..Default::default()
+    },
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: Some(10),
    oauth2_authorizer: None,
 });

@@ -665,9 +648,8 @@ static P_KOLST_COM: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/kolst-com",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -679,9 +661,8 @@ static P_KONTENT_COM: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/kontent-com",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -708,9 +689,8 @@ static P_MAIL_DE: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -726,9 +706,8 @@ static P_MAIL_RU: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Ssl, hostname: "imap.mail.ru", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.mail.ru", port: 465, username_pattern: Email },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -756,9 +735,8 @@ static P_MAIL2TOR: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -785,9 +763,8 @@ static P_MAILBOX_ORG: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -814,9 +791,8 @@ static P_MAILO_COM: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -843,6 +819,11 @@ static P_NAUTA_CU: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: ProviderOptions {
+        max_smtp_rcpt_to: Some(20),
+        strict_tls: false,
+        ..Default::default()
+    },
    config_defaults: Some(vec![
        ConfigDefault {
            key: Config::DeleteServerAfter,
@@ -869,8 +850,6 @@ static P_NAUTA_CU: Lazy<Provider> = Lazy::new(|| Provider {
            value: "0",
        },
    ]),
-    strict_tls: false,
-    max_smtp_rcpt_to: Some(20),
    oauth2_authorizer: None,
 });

@@ -897,9 +876,8 @@ static P_NAVER: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -926,9 +904,8 @@ static P_NUBO_COOP: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -955,9 +932,8 @@ static P_OUTLOOK_COM: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -984,9 +960,8 @@ static P_OUVATON_COOP: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -998,6 +973,13 @@ static P_POSTEO: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/posteo",
    server: vec![
+        Server {
+            protocol: Imap,
+            socket: Ssl,
+            hostname: "posteo.de",
+            port: 993,
+            username_pattern: Email,
+        },
        Server {
            protocol: Imap,
            socket: Starttls,
@@ -1005,6 +987,13 @@ static P_POSTEO: Lazy<Provider> = Lazy::new(|| Provider {
            port: 143,
            username_pattern: Email,
        },
+        Server {
+            protocol: Smtp,
+            socket: Ssl,
+            hostname: "posteo.de",
+            port: 465,
+            username_pattern: Email,
+        },
        Server {
            protocol: Smtp,
            socket: Starttls,
@@ -1013,9 +1002,8 @@ static P_POSTEO: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1029,9 +1017,8 @@ static P_PROTONMAIL: Lazy<Provider> = Lazy::new(|| {
    overview_page: "https://providers.delta.chat/protonmail",
    server: vec![
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -1048,9 +1035,8 @@ static P_QQ: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Ssl, hostname: "imap.qq.com", port: 993, username_pattern: Emaillocalpart },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.qq.com", port: 465, username_pattern: Email },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -1078,9 +1064,8 @@ static P_RISEUP_NET: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1092,9 +1077,21 @@ static P_ROGERS_COM: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/rogers-com",
    server: vec![],
+    opt: Default::default(),
+    config_defaults: None,
+    oauth2_authorizer: None,
+});
+
+// sonic.md: sonic.net
+static P_SONIC: Lazy<Provider> = Lazy::new(|| Provider {
+    id: "sonic",
+    status: Status::Ok,
+    before_login_hint: "",
+    after_login_hint: "",
+    overview_page: "https://providers.delta.chat/sonic",
+    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1121,9 +1118,8 @@ static P_SYSTEMAUSFALL_ORG: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1150,9 +1146,8 @@ static P_SYSTEMLI_ORG: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1168,9 +1163,8 @@ static P_T_ONLINE: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Ssl, hostname: "secureimap.t-online.de", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "securesmtp.t-online.de", port: 465, username_pattern: Email },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -1205,6 +1199,7 @@ static P_TESTRUN: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: Some(vec![
        ConfigDefault {
            key: Config::BccSelf,
@@ -1219,8 +1214,6 @@ static P_TESTRUN: Lazy<Provider> = Lazy::new(|| Provider {
            value: "0",
        },
    ]),
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1247,9 +1240,8 @@ static P_TISCALI_IT: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1263,9 +1255,8 @@ static P_TUTANOTA: Lazy<Provider> = Lazy::new(|| {
    overview_page: "https://providers.delta.chat/tutanota",
    server: vec![
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -1278,9 +1269,8 @@ static P_UKR_NET: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/ukr-net",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1307,9 +1297,8 @@ static P_UNDERNET_UY: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1321,9 +1310,8 @@ static P_VFEMAIL: Lazy<Provider> = Lazy::new(|| Provider {
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/vfemail",
    server: vec![],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1350,9 +1338,8 @@ static P_VIVALDI: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1379,9 +1366,8 @@ static P_VODAFONE_DE: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1398,9 +1384,8 @@ static P_WEB_DE: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Starttls, hostname: "imap.web.de", port: 143, username_pattern: Emaillocalpart },
        Server { protocol: Smtp, socket: Starttls, hostname: "smtp.web.de", port: 587, username_pattern: Emaillocalpart },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -1417,9 +1402,8 @@ static P_YAHOO: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Ssl, hostname: "imap.mail.yahoo.com", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.mail.yahoo.com", port: 465, username_pattern: Email },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -1447,9 +1431,8 @@ static P_YANDEX_RU: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: Some(Oauth2Authorizer::Yandex),
 });

@@ -1465,11 +1448,10 @@ static P_YGGMAIL: Lazy<Provider> = Lazy::new(|| {
        Server { protocol: Imap, socket: Plain, hostname: "localhost", port: 1143, username_pattern: Email },
        Server { protocol: Smtp, socket: Plain, hostname: "localhost", port: 1025, username_pattern: Email },
    ],
+    opt: Default::default(),
    config_defaults: Some(vec![
        ConfigDefault { key: Config::MvboxMove, value: "0" },
    ]),
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 }
 });
@@ -1497,9 +1479,8 @@ static P_ZIGGO_NL: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1526,9 +1507,8 @@ static P_ZOHO: Lazy<Provider> = Lazy::new(|| Provider {
            username_pattern: Email,
        },
    ],
+    opt: Default::default(),
    config_defaults: None,
-    strict_tls: true,
-    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
 });

@@ -1822,6 +1802,7 @@ pub(crate) static PROVIDER_DATA: Lazy<HashMap<&'static str, &'static Provider>>
        ("foxmail.com", &*P_QQ),
        ("riseup.net", &*P_RISEUP_NET),
        ("rogers.com", &*P_ROGERS_COM),
+        ("sonic.net", &*P_SONIC),
        ("systemausfall.org", &*P_SYSTEMAUSFALL_ORG),
        ("solidaris.me", &*P_SYSTEMAUSFALL_ORG),
        ("systemli.org", &*P_SYSTEMLI_ORG),
@@ -1946,6 +1927,7 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
        ("qq", &*P_QQ),
        ("riseup.net", &*P_RISEUP_NET),
        ("rogers.com", &*P_ROGERS_COM),
+        ("sonic", &*P_SONIC),
        ("systemausfall.org", &*P_SYSTEMAUSFALL_ORG),
        ("systemli.org", &*P_SYSTEMLI_ORG),
        ("t-online", &*P_T_ONLINE),
@@ -1970,4 +1952,4 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
 });

 pub static PROVIDER_UPDATED: Lazy<chrono::NaiveDate> =
-    Lazy::new(|| chrono::NaiveDate::from_ymd_opt(2023, 1, 6).unwrap());
+    Lazy::new(|| chrono::NaiveDate::from_ymd_opt(2023, 2, 21).unwrap());
@@ -40,6 +40,23 @@ def file2url(f):
    return "https://providers.delta.chat/" + f


+def process_opt(data):
+    if not "opt" in data:
+        return "Default::default()"
+    opt = "ProviderOptions {\n"
+    opt_data = data.get("opt", "")
+    for key in opt_data:
+        value = str(opt_data[key])
+        if key == "max_smtp_rcpt_to":
+            value = "Some(" + value + ")"
+        if value in {"True", "False"}:
+            value = value.lower()
+        opt += "        " + key + ": " + value + ",\n"
+    opt += "        ..Default::default()\n"
+    opt += "    }"
+    return opt
+
+
 def process_config_defaults(data):
    if not "config_defaults" in data:
        return "None"
@@ -106,14 +123,9 @@ def process_data(data, file):
            server += ("        Server { protocol: " + protocol.capitalize() + ", socket: " + socket.capitalize() + ", hostname: \""
            + hostname + "\", port: " + str(port) + ", username_pattern: " + username_pattern.capitalize() + " },\n")

+    opt = process_opt(data)
    config_defaults = process_config_defaults(data)

-    strict_tls = data.get("strict_tls", True)
-    strict_tls = "true" if strict_tls else "false"
-
-    max_smtp_rcpt_to = data.get("max_smtp_rcpt_to", 0)
-    max_smtp_rcpt_to = "Some(" + str(max_smtp_rcpt_to) + ")" if max_smtp_rcpt_to != 0 else "None"
-
    oauth2 = data.get("oauth2", "")
    oauth2 = "Some(Oauth2Authorizer::" + camel(oauth2) + ")" if oauth2 != "" else "None"

@@ -128,9 +140,8 @@ def process_data(data, file):
        provider += "    after_login_hint: \"" + after_login_hint + "\",\n"
        provider += "    overview_page: \"" + file2url(file) + "\",\n"
        provider += "    server: vec![\n" + server + "    ],\n"
+        provider += "    opt: " + opt + ",\n"
        provider += "    config_defaults: " + config_defaults + ",\n"
-        provider += "    strict_tls: " + strict_tls + ",\n"
-        provider += "    max_smtp_rcpt_to: " + max_smtp_rcpt_to + ",\n"
        provider += "    oauth2_authorizer: " + oauth2 + ",\n"
        provider += "});\n\n"
    else:
@@ -174,7 +185,9 @@ if __name__ == "__main__":
    "use crate::provider::Protocol::*;\n"
    "use crate::provider::Socket::*;\n"
    "use crate::provider::UsernamePattern::*;\n"
-    "use crate::provider::{Config, ConfigDefault, Oauth2Authorizer, Provider, Server, Status};\n"
+    "use crate::provider::{\n"
+    "    Config, ConfigDefault, Oauth2Authorizer, Provider, ProviderOptions, Server, Status,\n"
+    "};\n"
    "use std::collections::HashMap;\n\n"
    "use once_cell::sync::Lazy;\n\n")

@@ -342,11 +342,12 @@ pub(crate) async fn receive_imf_inner(
        if received_msg.needs_delete_job
            || (delete_server_after == Some(0) && is_partial_download.is_none())
        {
+            let target = context.get_delete_msgs_target().await?;
            context
                .sql
                .execute(
-                    "UPDATE imap SET target='' WHERE rfc724_mid=?",
-                    paramsv![rfc724_mid],
+                    "UPDATE imap SET target=? WHERE rfc724_mid=?",
+                    paramsv![target, rfc724_mid],
                )
                .await?;
        } else if !mime_parser.mdn_reports.is_empty() && mime_parser.has_chat_version() {
@@ -1084,8 +1085,6 @@ async fn add_parts(

    let mut created_db_entries = Vec::with_capacity(mime_parser.parts.len());

-    let conn = context.sql.get_conn().await?;
-
    for part in &mime_parser.parts {
        if part.is_reaction {
            set_msg_reaction(
@@ -1117,39 +1116,6 @@ async fn add_parts(
        }

        let mut txt_raw = "".to_string();
-        let mut stmt = conn.prepare_cached(
-            r#"
-INSERT INTO msgs
-  (
-    id,
-    rfc724_mid, chat_id,
-    from_id, to_id, timestamp, timestamp_sent, 
-    timestamp_rcvd, type, state, msgrmsg, 
-    txt, subject, txt_raw, param, 
-    bytes, mime_headers, mime_in_reply_to,
-    mime_references, mime_modified, error, ephemeral_timer,
-    ephemeral_timestamp, download_state, hop_info
-  )
-  VALUES (
-    ?,
-    ?, ?, ?, ?,
-    ?, ?, ?, ?,
-    ?, ?, ?, ?,
-    ?, ?, ?, ?,
-    ?, ?, ?, ?,
-    ?, ?, ?, ?
-  )
-ON CONFLICT (id) DO UPDATE
-SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
-    from_id=excluded.from_id, to_id=excluded.to_id, timestamp=excluded.timestamp, timestamp_sent=excluded.timestamp_sent,
-    timestamp_rcvd=excluded.timestamp_rcvd, type=excluded.type, state=excluded.state, msgrmsg=excluded.msgrmsg,
-    txt=excluded.txt, subject=excluded.subject, txt_raw=excluded.txt_raw, param=excluded.param,
-    bytes=excluded.bytes, mime_headers=excluded.mime_headers, mime_in_reply_to=excluded.mime_in_reply_to,
-    mime_references=excluded.mime_references, mime_modified=excluded.mime_modified, error=excluded.error, ephemeral_timer=excluded.ephemeral_timer,
-    ephemeral_timestamp=excluded.ephemeral_timestamp, download_state=excluded.download_state, hop_info=excluded.hop_info
-"#,
-        )?;
-
        let (msg, typ): (&str, Viewtype) = if let Some(better_msg) = &better_msg {
            (better_msg, Viewtype::Text)
        } else {
@@ -1183,7 +1149,38 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
        // also change `MsgId::trash()` and `delete_expired_messages()`
        let trash = chat_id.is_trash() || (is_location_kml && msg.is_empty());

-        stmt.execute(paramsv![
+        let row_id = context.sql.insert(
+            r#"
+INSERT INTO msgs
+  (
+    id,
+    rfc724_mid, chat_id,
+    from_id, to_id, timestamp, timestamp_sent, 
+    timestamp_rcvd, type, state, msgrmsg, 
+    txt, subject, txt_raw, param, 
+    bytes, mime_headers, mime_in_reply_to,
+    mime_references, mime_modified, error, ephemeral_timer,
+    ephemeral_timestamp, download_state, hop_info
+  )
+  VALUES (
+    ?,
+    ?, ?, ?, ?,
+    ?, ?, ?, ?,
+    ?, ?, ?, ?,
+    ?, ?, ?, ?,
+    ?, ?, ?, ?,
+    ?, ?, ?, ?
+  )
+ON CONFLICT (id) DO UPDATE
+SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
+    from_id=excluded.from_id, to_id=excluded.to_id, timestamp=excluded.timestamp, timestamp_sent=excluded.timestamp_sent,
+    timestamp_rcvd=excluded.timestamp_rcvd, type=excluded.type, state=excluded.state, msgrmsg=excluded.msgrmsg,
+    txt=excluded.txt, subject=excluded.subject, txt_raw=excluded.txt_raw, param=excluded.param,
+    bytes=excluded.bytes, mime_headers=excluded.mime_headers, mime_in_reply_to=excluded.mime_in_reply_to,
+    mime_references=excluded.mime_references, mime_modified=excluded.mime_modified, error=excluded.error, ephemeral_timer=excluded.ephemeral_timer,
+    ephemeral_timestamp=excluded.ephemeral_timestamp, download_state=excluded.download_state, hop_info=excluded.hop_info
+"#,
+            paramsv![
            replace_msg_id,
            rfc724_mid,
            if trash { DC_CHAT_ID_TRASH } else { chat_id },
@@ -1222,17 +1219,14 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
                DownloadState::Done
            },
            mime_parser.hop_info
-        ])?;
+        ]).await?;

        // We only replace placeholder with a first part,
        // afterwards insert additional parts.
        replace_msg_id = None;
-        let row_id = conn.last_insert_rowid();

-        drop(stmt);
        created_db_entries.push(MsgId::new(u32::try_from(row_id)?));
    }
-    drop(conn);

    // check all parts whether they contain a new logging webxdc
    for (part, msg_id) in mime_parser.parts.iter().zip(&created_db_entries) {
@@ -5,7 +5,7 @@ use crate::aheader::EncryptPreference;
 use crate::chat::get_chat_contacts;
 use crate::chat::{get_chat_msgs, ChatItem, ChatVisibility};
 use crate::chatlist::Chatlist;
-use crate::constants::{ShowEmails, DC_GCL_NO_SPECIALS};
+use crate::constants::DC_GCL_NO_SPECIALS;
 use crate::imap::prefetch_should_download;
 use crate::message::Message;
 use crate::test_utils::{get_chat_msg, TestContext, TestContextManager};
@@ -647,15 +647,11 @@ async fn test_parse_ndn(

    // Check that the ndn would be downloaded:
    let headers = mailparse::parse_mail(raw_ndn).unwrap().headers;
-    assert!(prefetch_should_download(
-        &t,
-        &headers,
-        "some-other-message-id",
-        std::iter::empty(),
-        ShowEmails::Off,
-    )
-    .await
-    .unwrap());
+    assert!(
+        prefetch_should_download(&t, &headers, "some-other-message-id", std::iter::empty(),)
+            .await
+            .unwrap()
+    );

    receive_imf(&t, raw_ndn, false).await.unwrap();
    let msg = Message::load_from_db(&t, msg_id).await.unwrap();
@@ -1,6 +1,8 @@
+use std::iter::{self, once};
+
 use anyhow::{bail, Context as _, Result};
 use async_channel::{self as channel, Receiver, Sender};
-use futures::try_join;
+use futures::future::try_join_all;
 use futures_lite::FutureExt;
 use tokio::task;

@@ -9,7 +11,7 @@ use crate::config::Config;
 use crate::contact::{ContactId, RecentlySeenLoop};
 use crate::context::Context;
 use crate::ephemeral::{self, delete_expired_imap_messages};
-use crate::imap::Imap;
+use crate::imap::{FolderMeaning, Imap};
 use crate::job;
 use crate::location;
 use crate::log::LogExt;
@@ -20,15 +22,19 @@ use crate::tools::{duration_to_str, maybe_add_time_based_warnings};

 pub(crate) mod connectivity;

+#[derive(Debug)]
+struct SchedBox {
+    meaning: FolderMeaning,
+    conn_state: ImapConnectionState,
+    handle: task::JoinHandle<()>,
+}
+
 /// Job and connection scheduler.
 #[derive(Debug)]
 pub(crate) struct Scheduler {
-    inbox: ImapConnectionState,
-    inbox_handle: task::JoinHandle<()>,
-    mvbox: ImapConnectionState,
-    mvbox_handle: Option<task::JoinHandle<()>>,
-    sentbox: ImapConnectionState,
-    sentbox_handle: Option<task::JoinHandle<()>>,
+    inbox: SchedBox,
+    /// Optional boxes -- mvbox, sentbox.
+    oboxes: Vec<SchedBox>,
    smtp: SmtpConnectionState,
    smtp_handle: task::JoinHandle<()>,
    ephemeral_handle: task::JoinHandle<()>,
@@ -161,7 +167,7 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
                        }
                    }

-                    info = fetch_idle(&ctx, &mut connection, Config::ConfiguredInboxFolder).await;
+                    info = fetch_idle(&ctx, &mut connection, FolderMeaning::Inbox).await;
                }
            }
        }
@@ -182,7 +188,20 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
 /// handling all the errors. In case of an error, it is logged, but not propagated upwards. If
 /// critical operation fails such as fetching new messages fails, connection is reset via
 /// `trigger_reconnect`, so a fresh one can be opened.
-async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config) -> InterruptInfo {
+async fn fetch_idle(
+    ctx: &Context,
+    connection: &mut Imap,
+    folder_meaning: FolderMeaning,
+) -> InterruptInfo {
+    let folder_config = match folder_meaning.to_config() {
+        Some(c) => c,
+        None => {
+            error!(ctx, "Bad folder meaning: {}", folder_meaning);
+            return connection
+                .fake_idle(ctx, None, FolderMeaning::Unknown)
+                .await;
+        }
+    };
    let folder = match ctx.get_config(folder_config).await {
        Ok(folder) => folder,
        Err(err) => {
@@ -190,7 +209,9 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config)
                ctx,
                "Can not watch {} folder, failed to retrieve config: {:#}", folder_config, err
            );
-            return connection.fake_idle(ctx, None).await;
+            return connection
+                .fake_idle(ctx, None, FolderMeaning::Unknown)
+                .await;
        }
    };

@@ -199,7 +220,9 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config)
    } else {
        connection.connectivity.set_not_configured(ctx).await;
        info!(ctx, "Can not watch {} folder, not set", folder_config);
-        return connection.fake_idle(ctx, None).await;
+        return connection
+            .fake_idle(ctx, None, FolderMeaning::Unknown)
+            .await;
    };

    // connect and fake idle if unable to connect
@@ -210,7 +233,9 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config)
    {
        warn!(ctx, "{:#}", err);
        connection.trigger_reconnect(ctx);
-        return connection.fake_idle(ctx, Some(watch_folder)).await;
+        return connection
+            .fake_idle(ctx, Some(watch_folder), folder_meaning)
+            .await;
    }

    if folder_config == Config::ConfiguredInboxFolder {
@@ -227,7 +252,7 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config)

    // Fetch the watched folder.
    if let Err(err) = connection
-        .fetch_move_delete(ctx, &watch_folder, false)
+        .fetch_move_delete(ctx, &watch_folder, folder_meaning)
        .await
        .context("fetch_move_delete")
    {
@@ -265,7 +290,7 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config)
                // no new messages. We want to select the watched folder anyway before going IDLE
                // there, so this does not take additional protocol round-trip.
                if let Err(err) = connection
-                    .fetch_move_delete(ctx, &watch_folder, false)
+                    .fetch_move_delete(ctx, &watch_folder, folder_meaning)
                    .await
                    .context("fetch_move_delete after scan_folders")
                {
@@ -293,7 +318,9 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config)
                ctx,
                "IMAP session does not support IDLE, going to fake idle."
            );
-            return connection.fake_idle(ctx, Some(watch_folder)).await;
+            return connection
+                .fake_idle(ctx, Some(watch_folder), folder_meaning)
+                .await;
        }

        info!(ctx, "IMAP session supports IDLE, using it.");
@@ -318,7 +345,9 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder_config: Config)
        }
    } else {
        warn!(ctx, "No IMAP session, going to fake idle.");
-        connection.fake_idle(ctx, Some(watch_folder)).await
+        connection
+            .fake_idle(ctx, Some(watch_folder), folder_meaning)
+            .await
    }
 }

@@ -326,11 +355,11 @@ async fn simple_imap_loop(
    ctx: Context,
    started: Sender<()>,
    inbox_handlers: ImapConnectionHandlers,
-    folder_config: Config,
+    folder_meaning: FolderMeaning,
 ) {
    use futures::future::FutureExt;

-    info!(ctx, "starting simple loop for {}", folder_config);
+    info!(ctx, "starting simple loop for {}", folder_meaning);
    let ImapConnectionHandlers {
        mut connection,
        stop_receiver,
@@ -346,7 +375,7 @@ async fn simple_imap_loop(
        }

        loop {
-            fetch_idle(&ctx, &mut connection, folder_config).await;
+            fetch_idle(&ctx, &mut connection, folder_meaning).await;
        }
    };

@@ -443,75 +472,56 @@ async fn smtp_loop(ctx: Context, started: Sender<()>, smtp_handlers: SmtpConnect
 impl Scheduler {
    /// Start the scheduler.
    pub async fn start(ctx: Context) -> Result<Self> {
-        let (mvbox, mvbox_handlers) = ImapConnectionState::new(&ctx).await?;
-        let (sentbox, sentbox_handlers) = ImapConnectionState::new(&ctx).await?;
        let (smtp, smtp_handlers) = SmtpConnectionState::new();
-        let (inbox, inbox_handlers) = ImapConnectionState::new(&ctx).await?;

-        let (inbox_start_send, inbox_start_recv) = channel::bounded(1);
-        let (mvbox_start_send, mvbox_start_recv) = channel::bounded(1);
-        let mut mvbox_handle = None;
-        let (sentbox_start_send, sentbox_start_recv) = channel::bounded(1);
-        let mut sentbox_handle = None;
        let (smtp_start_send, smtp_start_recv) = channel::bounded(1);
        let (ephemeral_interrupt_send, ephemeral_interrupt_recv) = channel::bounded(1);
        let (location_interrupt_send, location_interrupt_recv) = channel::bounded(1);

-        let inbox_handle = {
+        let mut oboxes = Vec::new();
+        let mut start_recvs = Vec::new();
+
+        let (conn_state, inbox_handlers) = ImapConnectionState::new(&ctx).await?;
+        let (inbox_start_send, inbox_start_recv) = channel::bounded(1);
+        let handle = {
            let ctx = ctx.clone();
            task::spawn(async move { inbox_loop(ctx, inbox_start_send, inbox_handlers).await })
        };
+        let inbox = SchedBox {
+            meaning: FolderMeaning::Inbox,
+            conn_state,
+            handle,
+        };
+        start_recvs.push(inbox_start_recv);

-        if ctx.should_watch_mvbox().await? {
-            let ctx = ctx.clone();
-            mvbox_handle = Some(task::spawn(async move {
-                simple_imap_loop(
-                    ctx,
-                    mvbox_start_send,
-                    mvbox_handlers,
-                    Config::ConfiguredMvboxFolder,
-                )
-                .await
-            }));
-        } else {
-            mvbox_start_send
-                .send(())
-                .await
-                .context("mvbox start send, missing receiver")?;
-            mvbox_handlers
-                .connection
-                .connectivity
-                .set_not_configured(&ctx)
-                .await
-        }
-
-        if ctx.get_config_bool(Config::SentboxWatch).await? {
-            let ctx = ctx.clone();
-            sentbox_handle = Some(task::spawn(async move {
-                simple_imap_loop(
-                    ctx,
-                    sentbox_start_send,
-                    sentbox_handlers,
-                    Config::ConfiguredSentboxFolder,
-                )
-                .await
-            }));
-        } else {
-            sentbox_start_send
-                .send(())
-                .await
-                .context("sentbox start send, missing receiver")?;
-            sentbox_handlers
-                .connection
-                .connectivity
-                .set_not_configured(&ctx)
-                .await
+        for (meaning, should_watch) in [
+            (FolderMeaning::Mvbox, ctx.should_watch_mvbox().await),
+            (
+                FolderMeaning::Sent,
+                ctx.get_config_bool(Config::SentboxWatch).await,
+            ),
+        ] {
+            if should_watch? {
+                let (conn_state, handlers) = ImapConnectionState::new(&ctx).await?;
+                let (start_send, start_recv) = channel::bounded(1);
+                let ctx = ctx.clone();
+                let handle = task::spawn(async move {
+                    simple_imap_loop(ctx, start_send, handlers, meaning).await
+                });
+                oboxes.push(SchedBox {
+                    meaning,
+                    conn_state,
+                    handle,
+                });
+                start_recvs.push(start_recv);
+            }
        }

        let smtp_handle = {
            let ctx = ctx.clone();
            task::spawn(async move { smtp_loop(ctx, smtp_start_send, smtp_handlers).await })
        };
+        start_recvs.push(smtp_start_recv);

        let ephemeral_handle = {
            let ctx = ctx.clone();
@@ -531,12 +541,8 @@ impl Scheduler {

        let res = Self {
            inbox,
-            mvbox,
-            sentbox,
+            oboxes,
            smtp,
-            inbox_handle,
-            mvbox_handle,
-            sentbox_handle,
            smtp_handle,
            ephemeral_handle,
            ephemeral_interrupt_send,
@@ -546,12 +552,7 @@ impl Scheduler {
        };

        // wait for all loops to be started
-        if let Err(err) = try_join!(
-            inbox_start_recv.recv(),
-            mvbox_start_recv.recv(),
-            sentbox_start_recv.recv(),
-            smtp_start_recv.recv()
-        ) {
+        if let Err(err) = try_join_all(start_recvs.iter().map(|r| r.recv())).await {
            bail!("failed to start scheduler: {}", err);
        }

@@ -559,30 +560,26 @@ impl Scheduler {
        Ok(res)
    }

+    fn boxes(&self) -> iter::Chain<iter::Once<&SchedBox>, std::slice::Iter<'_, SchedBox>> {
+        once(&self.inbox).chain(self.oboxes.iter())
+    }
+
    fn maybe_network(&self) {
-        self.interrupt_inbox(InterruptInfo::new(true));
-        self.interrupt_mvbox(InterruptInfo::new(true));
-        self.interrupt_sentbox(InterruptInfo::new(true));
+        for b in self.boxes() {
+            b.conn_state.interrupt(InterruptInfo::new(true));
+        }
        self.interrupt_smtp(InterruptInfo::new(true));
    }

    fn maybe_network_lost(&self) {
-        self.interrupt_inbox(InterruptInfo::new(false));
-        self.interrupt_mvbox(InterruptInfo::new(false));
-        self.interrupt_sentbox(InterruptInfo::new(false));
+        for b in self.boxes() {
+            b.conn_state.interrupt(InterruptInfo::new(false));
+        }
        self.interrupt_smtp(InterruptInfo::new(false));
    }

    fn interrupt_inbox(&self, info: InterruptInfo) {
-        self.inbox.interrupt(info);
-    }
-
-    fn interrupt_mvbox(&self, info: InterruptInfo) {
-        self.mvbox.interrupt(info);
-    }
-
-    fn interrupt_sentbox(&self, info: InterruptInfo) {
-        self.sentbox.interrupt(info);
+        self.inbox.conn_state.interrupt(info);
    }

    fn interrupt_smtp(&self, info: InterruptInfo) {
@@ -605,29 +602,17 @@ impl Scheduler {
    ///
    /// It consumes the scheduler and never fails to stop it. In the worst case, long-running tasks
    /// are forcefully terminated if they cannot shutdown within the timeout.
-    pub(crate) async fn stop(mut self, context: &Context) {
+    pub(crate) async fn stop(self, context: &Context) {
        // Send stop signals to tasks so they can shutdown cleanly.
-        self.inbox.stop().await.ok_or_log(context);
-        if self.mvbox_handle.is_some() {
-            self.mvbox.stop().await.ok_or_log(context);
-        }
-        if self.sentbox_handle.is_some() {
-            self.sentbox.stop().await.ok_or_log(context);
+        for b in self.boxes() {
+            b.conn_state.stop().await.ok_or_log(context);
        }
        self.smtp.stop().await.ok_or_log(context);

        // Actually shutdown tasks.
        let timeout_duration = std::time::Duration::from_secs(30);
-        tokio::time::timeout(timeout_duration, self.inbox_handle)
-            .await
-            .ok_or_log(context);
-        if let Some(mvbox_handle) = self.mvbox_handle.take() {
-            tokio::time::timeout(timeout_duration, mvbox_handle)
-                .await
-                .ok_or_log(context);
-        }
-        if let Some(sentbox_handle) = self.sentbox_handle.take() {
-            tokio::time::timeout(timeout_duration, sentbox_handle)
+        for b in once(self.inbox).chain(self.oboxes.into_iter()) {
+            tokio::time::timeout(timeout_duration, b.handle)
                .await
                .ok_or_log(context);
        }
@@ -1,18 +1,18 @@
 use core::fmt;
-use std::{ops::Deref, sync::Arc};
+use std::{iter::once, ops::Deref, sync::Arc};

 use anyhow::{anyhow, Result};
 use humansize::{format_size, BINARY};
 use tokio::sync::{Mutex, RwLockReadGuard};

 use crate::events::EventType;
-use crate::imap::scan_folders::get_watched_folder_configs;
+use crate::imap::{scan_folders::get_watched_folder_configs, FolderMeaning};
 use crate::quota::{
    QUOTA_ERROR_THRESHOLD_PERCENTAGE, QUOTA_MAX_AGE_SECONDS, QUOTA_WARN_THRESHOLD_PERCENTAGE,
 };
 use crate::tools::time;
-use crate::{config::Config, scheduler::Scheduler, stock_str, tools};
 use crate::{context::Context, log::LogExt};
+use crate::{scheduler::Scheduler, stock_str, tools};

 #[derive(Debug, Clone, Copy, PartialEq, Eq, EnumProperty, PartialOrd, Ord)]
 pub enum Connectivity {
@@ -157,17 +157,14 @@ impl ConnectivityStore {
 /// Called during `dc_maybe_network()` to make sure that `dc_accounts_all_work_done()`
 /// returns false immediately after `dc_maybe_network()`.
 pub(crate) async fn idle_interrupted(scheduler: RwLockReadGuard<'_, Option<Scheduler>>) {
-    let [inbox, mvbox, sentbox] = match &*scheduler {
-        Some(Scheduler {
-            inbox,
-            mvbox,
-            sentbox,
-            ..
-        }) => [
-            inbox.state.connectivity.clone(),
-            mvbox.state.connectivity.clone(),
-            sentbox.state.connectivity.clone(),
-        ],
+    let (inbox, oboxes) = match &*scheduler {
+        Some(Scheduler { inbox, oboxes, .. }) => (
+            inbox.conn_state.state.connectivity.clone(),
+            oboxes
+                .iter()
+                .map(|b| b.conn_state.state.connectivity.clone())
+                .collect::<Vec<_>>(),
+        ),
        None => return,
    };
    drop(scheduler);
@@ -185,7 +182,7 @@ pub(crate) async fn idle_interrupted(scheduler: RwLockReadGuard<'_, Option<Sched
    }
    drop(connectivity_lock);

-    for state in &[&mvbox, &sentbox] {
+    for state in oboxes {
        let mut connectivity_lock = state.0.lock().await;
        if *connectivity_lock == DetailedConnectivity::Connected {
            *connectivity_lock = DetailedConnectivity::InterruptingIdle;
@@ -202,17 +199,11 @@ pub(crate) async fn maybe_network_lost(
    context: &Context,
    scheduler: RwLockReadGuard<'_, Option<Scheduler>>,
 ) {
-    let stores = match &*scheduler {
-        Some(Scheduler {
-            inbox,
-            mvbox,
-            sentbox,
-            ..
-        }) => [
-            inbox.state.connectivity.clone(),
-            mvbox.state.connectivity.clone(),
-            sentbox.state.connectivity.clone(),
-        ],
+    let stores: Vec<_> = match &*scheduler {
+        Some(sched) => sched
+            .boxes()
+            .map(|b| b.conn_state.state.connectivity.clone())
+            .collect(),
        None => return,
    };
    drop(scheduler);
@@ -260,14 +251,9 @@ impl Context {
    pub async fn get_connectivity(&self) -> Connectivity {
        let lock = self.scheduler.read().await;
        let stores: Vec<_> = match &*lock {
-            Some(Scheduler {
-                inbox,
-                mvbox,
-                sentbox,
-                ..
-            }) => [&inbox.state, &mvbox.state, &sentbox.state]
-                .iter()
-                .map(|state| state.connectivity.clone())
+            Some(sched) => sched
+                .boxes()
+                .map(|b| b.conn_state.state.connectivity.clone())
                .collect(),
            None => return Connectivity::NotConnected,
        };
@@ -348,28 +334,12 @@ impl Context {

        let lock = self.scheduler.read().await;
        let (folders_states, smtp) = match &*lock {
-            Some(Scheduler {
-                inbox,
-                mvbox,
-                sentbox,
-                smtp,
-                ..
-            }) => (
-                [
-                    (
-                        Config::ConfiguredInboxFolder,
-                        inbox.state.connectivity.clone(),
-                    ),
-                    (
-                        Config::ConfiguredMvboxFolder,
-                        mvbox.state.connectivity.clone(),
-                    ),
-                    (
-                        Config::ConfiguredSentboxFolder,
-                        sentbox.state.connectivity.clone(),
-                    ),
-                ],
-                smtp.state.connectivity.clone(),
+            Some(sched) => (
+                sched
+                    .boxes()
+                    .map(|b| (b.meaning, b.conn_state.state.connectivity.clone()))
+                    .collect::<Vec<_>>(),
+                sched.smtp.state.connectivity.clone(),
            ),
            None => {
                return Err(anyhow!("Not started"));
@@ -390,8 +360,8 @@ impl Context {
        for (folder, state) in &folders_states {
            let mut folder_added = false;

-            if watched_folders.contains(folder) {
-                let f = self.get_config(*folder).await.ok_or_log(self).flatten();
+            if let Some(config) = folder.to_config().filter(|c| watched_folders.contains(c)) {
+                let f = self.get_config(config).await.ok_or_log(self).flatten();

                if let Some(foldername) = f {
                    let detailed = &state.get_detailed().await;
@@ -407,7 +377,7 @@ impl Context {
                }
            }

-            if !folder_added && folder == &Config::ConfiguredInboxFolder {
+            if !folder_added && folder == &FolderMeaning::Inbox {
                let detailed = &state.get_detailed().await;
                if let DetailedConnectivity::Error(_) = detailed {
                    // On the inbox thread, we also do some other things like scan_folders and run jobs
@@ -535,14 +505,10 @@ impl Context {
    pub async fn all_work_done(&self) -> bool {
        let lock = self.scheduler.read().await;
        let stores: Vec<_> = match &*lock {
-            Some(Scheduler {
-                inbox,
-                mvbox,
-                sentbox,
-                smtp,
-                ..
-            }) => [&inbox.state, &mvbox.state, &sentbox.state, &smtp.state]
-                .iter()
+            Some(sched) => sched
+                .boxes()
+                .map(|b| &b.conn_state.state)
+                .chain(once(&sched.smtp.state))
                .map(|state| state.connectivity.clone())
                .collect(),
            None => return false,
@@ -101,8 +101,9 @@ impl Smtp {
            &lp.smtp,
            &lp.socks5_config,
            &lp.addr,
-            lp.provider
-                .map_or(lp.socks5_config.is_some(), |provider| provider.strict_tls),
+            lp.provider.map_or(lp.socks5_config.is_some(), |provider| {
+                provider.opt.strict_tls
+            }),
        )
        .await
    }
@@ -47,7 +47,7 @@ impl Smtp {
        let chunk_size = context
            .get_configured_provider()
            .await?
-            .and_then(|provider| provider.max_smtp_rcpt_to)
+            .and_then(|provider| provider.opt.max_smtp_rcpt_to)
            .map_or(DEFAULT_MAX_SMTP_RCPT_TO, usize::from);

        for recipients_chunk in recipients.chunks(chunk_size) {
@@ -2,12 +2,10 @@

 use std::collections::{HashMap, HashSet};
 use std::convert::TryFrom;
-use std::path::Path;
-use std::path::PathBuf;
-use std::time::Duration;
+use std::path::{Path, PathBuf};

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

 use crate::blob::BlobObject;
@@ -47,10 +45,10 @@ pub(crate) fn params_iter(iter: &[impl crate::ToSql]) -> impl Iterator<Item = &d
    iter.iter().map(|item| item as &dyn crate::ToSql)
 }

-mod connection_manager;
 mod migrations;
+mod pool;

-use connection_manager::ConnectionManager;
+use pool::Pool;

 /// A wrapper around the underlying Sqlite3 object.
 #[derive(Debug)]
@@ -59,7 +57,7 @@ pub struct Sql {
    pub(crate) dbfile: PathBuf,

    /// SQL connection pool.
-    pool: RwLock<Option<r2d2::Pool<ConnectionManager>>>,
+    pool: RwLock<Option<Pool>>,

    /// None if the database is not open, true if it is open with passphrase and false if it is
    /// open without a passphrase.
@@ -125,87 +123,66 @@ impl Sql {
        // drop closes the connection
    }

-    /// Exports the database to a separate file with the given passphrase.
-    ///
-    /// Set passphrase to empty string to export the database unencrypted.
-    pub(crate) async fn export(&self, path: &Path, passphrase: String) -> Result<()> {
-        let path_str = path
-            .to_str()
-            .with_context(|| format!("path {path:?} is not valid unicode"))?;
-        let conn = self.get_conn().await?;
-        tokio::task::block_in_place(move || {
-            conn.execute(
-                "ATTACH DATABASE ? AS backup KEY ?",
-                paramsv![path_str, passphrase],
-            )
-            .context("failed to attach backup database")?;
-            let res = conn
-                .query_row("SELECT sqlcipher_export('backup')", [], |_row| Ok(()))
-                .context("failed to export to attached backup database");
-            conn.execute("DETACH DATABASE backup", [])
-                .context("failed to detach backup database")?;
-            res?;
-
-            Ok(())
-        })
-    }
-
    /// Imports the database from a separate file with the given passphrase.
    pub(crate) async fn import(&self, path: &Path, passphrase: String) -> Result<()> {
        let path_str = path
            .to_str()
-            .with_context(|| format!("path {path:?} is not valid unicode"))?;
-        let conn = self.get_conn().await?;
+            .with_context(|| format!("path {path:?} is not valid unicode"))?
+            .to_string();
+        let res = self
+            .call(move |conn| {
+                // Check that backup passphrase is correct before resetting our database.
+                conn.execute(
+                    "ATTACH DATABASE ? AS backup KEY ?",
+                    paramsv![path_str, passphrase],
+                )
+                .context("failed to attach backup database")?;
+                if let Err(err) = conn
+                    .query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
+                    .context("backup passphrase is not correct")
+                {
+                    conn.execute("DETACH DATABASE backup", [])
+                        .context("failed to detach backup database")?;
+                    return Err(err);
+                }

-        tokio::task::block_in_place(move || {
-            // Check that backup passphrase is correct before resetting our database.
-            conn.execute(
-                "ATTACH DATABASE ? AS backup KEY ?",
-                paramsv![path_str, passphrase],
-            )
-            .context("failed to attach backup database")?;
-            if let Err(err) = conn
-                .query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
-                .context("backup passphrase is not correct")
-            {
+                // Reset the database without reopening it. We don't want to reopen the database because we
+                // don't have main database passphrase at this point.
+                // See <https://sqlite.org/c3ref/c_dbconfig_enable_fkey.html> for documentation.
+                // Without resetting import may fail due to existing tables.
+                conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, true)
+                    .context("failed to set SQLITE_DBCONFIG_RESET_DATABASE")?;
+                conn.execute("VACUUM", [])
+                    .context("failed to vacuum the database")?;
+                conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, false)
+                    .context("failed to unset SQLITE_DBCONFIG_RESET_DATABASE")?;
+                let res = conn
+                    .query_row("SELECT sqlcipher_export('main', 'backup')", [], |_row| {
+                        Ok(())
+                    })
+                    .context("failed to import from attached backup database");
                conn.execute("DETACH DATABASE backup", [])
                    .context("failed to detach backup database")?;
-                return Err(err);
-            }
+                res?;
+                Ok(())
+            })
+            .await;

-            // Reset the database without reopening it. We don't want to reopen the database because we
-            // don't have main database passphrase at this point.
-            // See <https://sqlite.org/c3ref/c_dbconfig_enable_fkey.html> for documentation.
-            // Without resetting import may fail due to existing tables.
-            conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, true)
-                .context("failed to set SQLITE_DBCONFIG_RESET_DATABASE")?;
-            conn.execute("VACUUM", [])
-                .context("failed to vacuum the database")?;
-            conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, false)
-                .context("failed to unset SQLITE_DBCONFIG_RESET_DATABASE")?;
-            let res = conn
-                .query_row("SELECT sqlcipher_export('main', 'backup')", [], |_row| {
-                    Ok(())
-                })
-                .context("failed to import from attached backup database");
-            conn.execute("DETACH DATABASE backup", [])
-                .context("failed to detach backup database")?;
-            res?;
-            Ok(())
-        })
+        // The config cache is wrong now that we have a different database
+        self.config_cache.write().await.clear();
+
+        res
    }

-    fn new_pool(dbfile: &Path, passphrase: String) -> Result<r2d2::Pool<ConnectionManager>> {
-        // this actually creates min_idle database handles just now.
-        // therefore, with_init() must not try to modify the database as otherwise
-        // we easily get busy-errors (eg. table-creation, journal_mode etc. should be done on only one handle)
-        let mgr = ConnectionManager::new(dbfile.to_path_buf(), passphrase);
-        let pool = r2d2::Pool::builder()
-            .min_idle(Some(2))
-            .max_size(10)
-            .connection_timeout(Duration::from_secs(60))
-            .build(mgr)
-            .context("Can't build SQL connection pool")?;
+    /// Creates a new connection pool.
+    fn new_pool(dbfile: &Path, passphrase: String) -> Result<Pool> {
+        let mut connections = Vec::new();
+        for _ in 0..3 {
+            let connection = new_connection(dbfile, &passphrase)?;
+            connections.push(connection);
+        }
+
+        let pool = Pool::new(connections);
        Ok(pool)
    }

@@ -322,22 +299,41 @@ impl Sql {
        }
    }

+    /// Allocates a connection and calls given function with the connection.
+    ///
+    /// Returns the result of the function.
+    pub async fn call<'a, F, R>(&'a self, function: F) -> Result<R>
+    where
+        F: 'a + FnOnce(&mut Connection) -> Result<R> + Send,
+        R: Send + 'static,
+    {
+        let lock = self.pool.read().await;
+        let pool = lock.as_ref().context("no SQL connection")?;
+        let mut conn = pool.get().await?;
+        let res = tokio::task::block_in_place(move || function(&mut conn))?;
+        Ok(res)
+    }
+
    /// Execute the given query, returning the number of affected rows.
-    pub async fn execute(&self, query: &str, params: impl rusqlite::Params) -> Result<usize> {
-        let conn = self.get_conn().await?;
-        tokio::task::block_in_place(move || {
+    pub async fn execute(
+        &self,
+        query: &str,
+        params: impl rusqlite::Params + Send,
+    ) -> Result<usize> {
+        self.call(move |conn| {
            let res = conn.execute(query, params)?;
            Ok(res)
        })
+        .await
    }

    /// Executes the given query, returning the last inserted row ID.
-    pub async fn insert(&self, query: &str, params: impl rusqlite::Params) -> Result<i64> {
-        let conn = self.get_conn().await?;
-        tokio::task::block_in_place(move || {
+    pub async fn insert(&self, query: &str, params: impl rusqlite::Params + Send) -> Result<i64> {
+        self.call(move |conn| {
            conn.execute(query, params)?;
            Ok(conn.last_insert_rowid())
        })
+        .await
    }

    /// Prepares and executes the statement and maps a function over the resulting rows.
@@ -346,40 +342,32 @@ impl Sql {
    pub async fn query_map<T, F, G, H>(
        &self,
        sql: &str,
-        params: impl rusqlite::Params,
+        params: impl rusqlite::Params + Send,
        f: F,
        mut g: G,
    ) -> Result<H>
    where
-        F: FnMut(&rusqlite::Row) -> rusqlite::Result<T>,
-        G: FnMut(rusqlite::MappedRows<F>) -> Result<H>,
+        F: Send + FnMut(&rusqlite::Row) -> rusqlite::Result<T>,
+        G: Send + FnMut(rusqlite::MappedRows<F>) -> Result<H>,
+        H: Send + 'static,
    {
-        let conn = self.get_conn().await?;
-        tokio::task::block_in_place(move || {
+        self.call(move |conn| {
            let mut stmt = conn.prepare(sql)?;
            let res = stmt.query_map(params, f)?;
            g(res)
        })
-    }
-
-    /// Allocates a connection from the connection pool and returns it.
-    pub(crate) async fn get_conn(&self) -> Result<r2d2::PooledConnection<ConnectionManager>> {
-        let lock = self.pool.read().await;
-        let pool = lock.as_ref().context("no SQL connection")?;
-        let conn = pool.get()?;
-
-        Ok(conn)
+        .await
    }

    /// Used for executing `SELECT COUNT` statements only. Returns the resulting count.
-    pub async fn count(&self, query: &str, params: impl rusqlite::Params) -> Result<usize> {
+    pub async fn count(&self, query: &str, params: impl rusqlite::Params + Send) -> Result<usize> {
        let count: isize = self.query_row(query, params, |row| row.get(0)).await?;
        Ok(usize::try_from(count)?)
    }

    /// Used for executing `SELECT COUNT` statements only. Returns `true`, if the count is at least
    /// one, `false` otherwise.
-    pub async fn exists(&self, sql: &str, params: impl rusqlite::Params) -> Result<bool> {
+    pub async fn exists(&self, sql: &str, params: impl rusqlite::Params + Send) -> Result<bool> {
        let count = self.count(sql, params).await?;
        Ok(count > 0)
    }
@@ -388,31 +376,37 @@ impl Sql {
    pub async fn query_row<T, F>(
        &self,
        query: &str,
-        params: impl rusqlite::Params,
+        params: impl rusqlite::Params + Send,
        f: F,
    ) -> Result<T>
    where
-        F: FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
+        F: FnOnce(&rusqlite::Row) -> rusqlite::Result<T> + Send,
+        T: Send + 'static,
    {
-        let conn = self.get_conn().await?;
-        tokio::task::block_in_place(move || {
+        self.call(move |conn| {
            let res = conn.query_row(query, params, f)?;
            Ok(res)
        })
+        .await
    }

    /// Execute the function inside a transaction.
    ///
    /// If the function returns an error, the transaction will be rolled back. If it does not return an
    /// error, the transaction will be committed.
+    ///
+    /// Transactions started use IMMEDIATE behavior
+    /// rather than default DEFERRED behavior
+    /// to avoid "database is busy" errors
+    /// which may happen when DEFERRED transaction
+    /// is attempted to be promoted to a write transaction.
    pub async fn transaction<G, H>(&self, callback: G) -> Result<H>
    where
        H: Send + 'static,
        G: Send + FnOnce(&mut rusqlite::Transaction<'_>) -> Result<H>,
    {
-        let mut conn = self.get_conn().await?;
-        tokio::task::block_in_place(move || {
-            let mut transaction = conn.transaction()?;
+        self.call(move |conn| {
+            let mut transaction = conn.transaction_with_behavior(TransactionBehavior::Immediate)?;
            let ret = callback(&mut transaction);

            match ret {
@@ -426,12 +420,12 @@ impl Sql {
                }
            }
        })
+        .await
    }

    /// Query the database if the requested table already exists.
    pub async fn table_exists(&self, name: &str) -> Result<bool> {
-        let conn = self.get_conn().await?;
-        tokio::task::block_in_place(move || {
+        self.call(move |conn| {
            let mut exists = false;
            conn.pragma(None, "table_info", name.to_string(), |_row| {
                // will only be executed if the info was found
@@ -441,12 +435,12 @@ impl Sql {

            Ok(exists)
        })
+        .await
    }

    /// Check if a column exists in a given table.
    pub async fn col_exists(&self, table_name: &str, col_name: &str) -> Result<bool> {
-        let conn = self.get_conn().await?;
-        tokio::task::block_in_place(move || {
+        self.call(move |conn| {
            let mut exists = false;
            // `PRAGMA table_info` returns one row per column,
            // each row containing 0=cid, 1=name, 2=type, 3=notnull, 4=dflt_value
@@ -460,29 +454,27 @@ impl Sql {

            Ok(exists)
        })
+        .await
    }

    /// Execute a query which is expected to return zero or one row.
    pub async fn query_row_optional<T, F>(
        &self,
        sql: &str,
-        params: impl rusqlite::Params,
+        params: impl rusqlite::Params + Send,
        f: F,
    ) -> Result<Option<T>>
    where
-        F: FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
+        F: Send + FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
+        T: Send + 'static,
    {
-        let conn = self.get_conn().await?;
-        let res =
-            tokio::task::block_in_place(move || match conn.query_row(sql.as_ref(), params, f) {
-                Ok(res) => Ok(Some(res)),
-                Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
-                Err(rusqlite::Error::InvalidColumnType(_, _, rusqlite::types::Type::Null)) => {
-                    Ok(None)
-                }
-                Err(err) => Err(err),
-            })?;
-        Ok(res)
+        self.call(move |conn| match conn.query_row(sql.as_ref(), params, f) {
+            Ok(res) => Ok(Some(res)),
+            Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
+            Err(rusqlite::Error::InvalidColumnType(_, _, rusqlite::types::Type::Null)) => Ok(None),
+            Err(err) => Err(err.into()),
+        })
+        .await
    }

    /// Executes a query which is expected to return one row and one
@@ -491,10 +483,10 @@ impl Sql {
    pub async fn query_get_value<T>(
        &self,
        query: &str,
-        params: impl rusqlite::Params,
+        params: impl rusqlite::Params + Send,
    ) -> Result<Option<T>>
    where
-        T: rusqlite::types::FromSql,
+        T: rusqlite::types::FromSql + Send + 'static,
    {
        self.query_row_optional(query, params, |row| row.get::<_, T>(0))
            .await
@@ -610,6 +602,42 @@ impl Sql {
    }
 }

+/// Creates a new SQLite connection.
+///
+/// `path` is the database path.
+///
+/// `passphrase` is the SQLCipher database passphrase.
+/// Empty string if database is not encrypted.
+fn new_connection(path: &Path, passphrase: &str) -> Result<Connection> {
+    let mut flags = OpenFlags::SQLITE_OPEN_NO_MUTEX;
+    flags.insert(OpenFlags::SQLITE_OPEN_READ_WRITE);
+    flags.insert(OpenFlags::SQLITE_OPEN_CREATE);
+
+    let conn = Connection::open_with_flags(path, flags)?;
+    conn.execute_batch(
+        "PRAGMA cipher_memory_security = OFF; -- Too slow on Android
+         PRAGMA secure_delete=on;
+         PRAGMA busy_timeout = 60000; -- 60 seconds
+         PRAGMA temp_store=memory; -- Avoid SQLITE_IOERR_GETTEMPPATH errors on Android
+         PRAGMA foreign_keys=on;
+         ",
+    )?;
+    conn.pragma_update(None, "key", passphrase)?;
+    // Try to enable auto_vacuum. This will only be
+    // applied if the database is new or after successful
+    // VACUUM, which usually happens before backup export.
+    // When auto_vacuum is INCREMENTAL, it is possible to
+    // use PRAGMA incremental_vacuum to return unused
+    // database pages to the filesystem.
+    conn.pragma_update(None, "auto_vacuum", "INCREMENTAL".to_string())?;
+
+    conn.pragma_update(None, "journal_mode", "WAL".to_string())?;
+    // Default synchronous=FULL is much slower. NORMAL is sufficient for WAL mode.
+    conn.pragma_update(None, "synchronous", "NORMAL".to_string())?;
+
+    Ok(conn)
+}
+
 /// Cleanup the account to restore some storage and optimize the database.
 pub async fn housekeeping(context: &Context) -> Result<()> {
    if let Err(err) = remove_unused_files(context).await {
@@ -921,11 +949,16 @@ mod tests {
    async fn test_auto_vacuum() -> Result<()> {
        let t = TestContext::new().await;

-        let conn = t.sql.get_conn().await?;
-        let auto_vacuum = conn.pragma_query_value(None, "auto_vacuum", |row| {
-            let auto_vacuum: i32 = row.get(0)?;
-            Ok(auto_vacuum)
-        })?;
+        let auto_vacuum = t
+            .sql
+            .call(|conn| {
+                let auto_vacuum = conn.pragma_query_value(None, "auto_vacuum", |row| {
+                    let auto_vacuum: i32 = row.get(0)?;
+                    Ok(auto_vacuum)
+                })?;
+                Ok(auto_vacuum)
+            })
+            .await?;

        // auto_vacuum=2 is the same as auto_vacuum=INCREMENTAL
        assert_eq!(auto_vacuum, 2);
@@ -1,73 +0,0 @@
-use std::path::PathBuf;
-use std::time::Duration;
-
-use r2d2::ManageConnection;
-use rusqlite::{Connection, Error, OpenFlags};
-
-#[derive(Debug)]
-pub struct ConnectionManager {
-    /// Database file path.
-    path: PathBuf,
-
-    /// SQLite open flags.
-    flags: rusqlite::OpenFlags,
-
-    /// SQLCipher database passphrase.
-    /// Empty string if database is not encrypted.
-    passphrase: String,
-}
-
-impl ConnectionManager {
-    /// Creates new connection manager.
-    pub fn new(path: PathBuf, passphrase: String) -> Self {
-        let mut flags = OpenFlags::SQLITE_OPEN_NO_MUTEX;
-        flags.insert(OpenFlags::SQLITE_OPEN_READ_WRITE);
-        flags.insert(OpenFlags::SQLITE_OPEN_CREATE);
-
-        Self {
-            path,
-            flags,
-            passphrase,
-        }
-    }
-}
-
-impl ManageConnection for ConnectionManager {
-    type Connection = Connection;
-    type Error = Error;
-
-    fn connect(&self) -> Result<Connection, Error> {
-        let conn = Connection::open_with_flags(&self.path, self.flags)?;
-        conn.execute_batch(&format!(
-            "PRAGMA cipher_memory_security = OFF; -- Too slow on Android
-             PRAGMA secure_delete=on;
-             PRAGMA busy_timeout = {};
-             PRAGMA temp_store=memory; -- Avoid SQLITE_IOERR_GETTEMPPATH errors on Android
-             PRAGMA foreign_keys=on;
-             ",
-            Duration::from_secs(60).as_millis()
-        ))?;
-        conn.pragma_update(None, "key", &self.passphrase)?;
-        // Try to enable auto_vacuum. This will only be
-        // applied if the database is new or after successful
-        // VACUUM, which usually happens before backup export.
-        // When auto_vacuum is INCREMENTAL, it is possible to
-        // use PRAGMA incremental_vacuum to return unused
-        // database pages to the filesystem.
-        conn.pragma_update(None, "auto_vacuum", "INCREMENTAL".to_string())?;
-
-        conn.pragma_update(None, "journal_mode", "WAL".to_string())?;
-        // Default synchronous=FULL is much slower. NORMAL is sufficient for WAL mode.
-        conn.pragma_update(None, "synchronous", "NORMAL".to_string())?;
-
-        Ok(conn)
-    }
-
-    fn is_valid(&self, _conn: &mut Connection) -> Result<(), Error> {
-        Ok(())
-    }
-
-    fn has_broken(&self, _conn: &mut Connection) -> bool {
-        false
-    }
-}
@@ -0,0 +1,109 @@
+//! # SQLite connection pool.
+//!
+//! The connection pool holds a number of SQLite connections and allows to allocate them.
+//! When allocated connection is dropped, underlying connection is returned back to the pool.
+//!
+//! The pool is organized as a stack. It always allocates the most recently used connection.
+//! Each SQLite connection has its own page cache, so allocating recently used connections
+//! improves the performance compared to, for example, organizing the pool as a queue
+//! and returning the least recently used connection each time.
+
+use std::ops::{Deref, DerefMut};
+use std::sync::{Arc, Weak};
+
+use anyhow::{Context, Result};
+use parking_lot::Mutex;
+use rusqlite::Connection;
+use tokio::sync::{OwnedSemaphorePermit, Semaphore};
+
+/// Inner connection pool.
+#[derive(Debug)]
+struct InnerPool {
+    /// Available connections.
+    connections: Mutex<Vec<Connection>>,
+
+    /// Counts the number of available connections.
+    semaphore: Arc<Semaphore>,
+}
+
+impl InnerPool {
+    /// Puts a connection into the pool.
+    ///
+    /// The connection could be new or returned back.
+    fn put(&self, connection: Connection) {
+        let mut connections = self.connections.lock();
+        connections.push(connection);
+        drop(connections);
+    }
+}
+
+/// Pooled connection.
+pub struct PooledConnection {
+    /// Weak reference to the pool used to return the connection back.
+    pool: Weak<InnerPool>,
+
+    /// Only `None` right after moving the connection back to the pool.
+    conn: Option<Connection>,
+
+    /// Semaphore permit, dropped after returning the connection to the pool.
+    _permit: OwnedSemaphorePermit,
+}
+
+impl Drop for PooledConnection {
+    fn drop(&mut self) {
+        // Put the connection back unless the pool is already dropped.
+        if let Some(pool) = self.pool.upgrade() {
+            if let Some(conn) = self.conn.take() {
+                pool.put(conn);
+            }
+        }
+    }
+}
+
+impl Deref for PooledConnection {
+    type Target = Connection;
+
+    fn deref(&self) -> &Connection {
+        self.conn.as_ref().unwrap()
+    }
+}
+
+impl DerefMut for PooledConnection {
+    fn deref_mut(&mut self) -> &mut Connection {
+        self.conn.as_mut().unwrap()
+    }
+}
+
+/// Connection pool.
+#[derive(Clone, Debug)]
+pub struct Pool {
+    /// Reference to the actual connection pool.
+    inner: Arc<InnerPool>,
+}
+
+impl Pool {
+    /// Creates a new connection pool.
+    pub fn new(connections: Vec<Connection>) -> Self {
+        let semaphore = Arc::new(Semaphore::new(connections.len()));
+        let inner = Arc::new(InnerPool {
+            connections: Mutex::new(connections),
+            semaphore,
+        });
+        Pool { inner }
+    }
+
+    /// Retrieves a connection from the pool.
+    pub async fn get(&self) -> Result<PooledConnection> {
+        let permit = self.inner.semaphore.clone().acquire_owned().await?;
+        let mut connections = self.inner.connections.lock();
+        let conn = connections
+            .pop()
+            .context("got a permit when there are no connections in the pool")?;
+        let conn = PooledConnection {
+            pool: Arc::downgrade(&self.inner),
+            conn: Some(conn),
+            _permit: permit,
+        };
+        Ok(conn)
+    }
+}
Author	SHA1	Message	Date
iequidoo	7c7801b9a9	Update provider/data.rs from the deltachat-provider-db repo	2023-02-21 11:03:49 -03:00
iequidoo	15c9efaa95	Update provider/update.py according to the `struct Provider` changes	2023-02-21 10:53:15 -03:00
link2xt	e86fbf5855	ci: stop using deprecated Ubuntu 18.04 GitHub Actions fails running 18.04 jobs currently: <https://github.com/actions/runner-images/issues/6002>	2023-02-21 13:10:12 +00:00
bjoern	38a62d92ba	mention speedup of #4065 in CHANGELOG (#4073 ) the speedup of #4065 is larger than measured first running `cargo test`, first we thought there is only a slight speedup from 13.5 seconds to 12.5 seconds on a m1pro. however, there is one test that does 11 seconds of sleep() (test_modify_chat_disordered) as this test is not run very first, this slows down things overall. skipping this test, speedup is from 13.5 seconds to 9.5 seconds - 28% faster - and this is something we should mention in the changelog :) (this pr does not remove or change the slow test. i think, due to the number of cores, this is not needed until someone has a machine where the other tests run in 2 seconds or so)	2023-02-21 13:36:36 +01:00
link2xt	c01a2f2c24	Fix missing imports in deltachat_rpc_client	2023-02-21 12:21:17 +00:00
Hocuri	17acbca576	Correctly clear database cache after import (#4067 )	2023-02-21 11:23:34 +00:00
link2xt	05a274a5f3	Enable more ruff checks in deltachat-rpc-client	2023-02-21 11:17:10 +00:00
link2xt	f07206bd6c	Pin ruff version in deltachat-rpc-client Latest versions 0.0.248 and 0.0.249 report false positive: src/deltachat_rpc_client/client.py:105:9: RET503 [*] Missing explicit `return` at the end of function able to return	2023-02-20 19:57:54 +00:00
link2xt	92c7cc40d4	sql: replace .get_conn() interface with .call() .call() interface is safer because it ensures that blocking operations on SQL connection are called within tokio::task::block_in_place(). Previously some code called blocking operations in async context, e.g. add_parts() in receive_imf module. The underlying implementation of .call() can later be replaced with an implementation that does not require block_in_place(), e.g. a worker pool, without changing the code using the .call() interface.	2023-02-20 18:54:29 +00:00
Hocuri	710cec1beb	Remove show_emails argument from prefetch_should_download() (#4064 ) IIRC, this was written this way back when we didn't have config caching, in order to save database accesses by getting the config outside the for loop.	2023-02-20 18:06:43 +00:00
link2xt	56d10f7c42	Use transaction in `update_blocked_mailinglist_contacts`	2023-02-20 17:17:59 +00:00
Franz Heinzmann	ef03a33b29	JSON-RPC: Add CommonJS build (#4062 ) add CommonJS build	2023-02-20 18:10:32 +01:00
iequidoo	3b5227c42a	Move strict_tls, max_smtp_rcpt_to from Provider to ProviderOptions	2023-02-20 14:09:27 -03:00
iequidoo	604c4fcb71	Delete messages to the Trash folder for Gmail by default (#3957 ) Gmail archives messages marked as `\Deleted` by default if those messages aren't in the Trash. But if move them to the Trash instead, they will be auto-deleted in 30 days.	2023-02-20 14:09:27 -03:00
link2xt	4790ad0478	Merge switching SQLite connection pool from FIFO to LIFO	2023-02-20 16:43:19 +00:00
link2xt	eaa2ef5a44	sql: start transactions as IMMEDIATE With the introduction of transactions in Contact::add_or_lookup(), python tests sometimes fail to create contacts with the folowing error: Cannot create contact: add_or_lookup: database is locked: Error code 5: The database file is locked `PRAGMA busy_timeout=60000` does not affect this case as the error is returned before 60 seconds pass. DEFERRED transactions with write operations need to be retried from scratch if they are rolled back due to a write operation on another connection. Using IMMEDIATE transactions for writing is an attempt to fix this problem without a retry loop. If we later need DEFERRED transactions, e.g. for reading a snapshot without locking the database, we may introduce another function for this.	2023-02-20 15:05:35 +00:00
link2xt	2eeacb0f8a	sql: organize connection pool as a stack rather than a queue When connection pool is organized as a stack, it always returns most recently used connection. Because each connection has its own page cache, using the connection with fresh cache improves performance. I commented out `oauth2::tests::test_oauth_from_mx` because it requires network connection, turned off the Wi-Fi and ran the tests. Before the change, with a queue: ``` $ hyperfine "cargo test" Benchmark 1: cargo test Time (mean ± σ): 56.424 s ± 4.515 s [User: 183.181 s, System: 128.156 s] Range (min … max): 52.123 s … 68.193 s 10 runs ``` With a stack: ``` $ hyperfine "cargo test" Benchmark 1: cargo test Time (mean ± σ): 29.887 s ± 1.377 s [User: 101.226 s, System: 45.573 s] Range (min … max): 26.591 s … 31.010 s 10 runs ``` On version 1.107.1: ``` $ hyperfine "cargo test" Benchmark 1: cargo test Time (mean ± σ): 43.658 s ± 1.079 s [User: 202.582 s, System: 50.723 s] Range (min … max): 41.531 s … 45.170 s 10 runs ```	2023-02-20 15:00:37 +00:00
link2xt	840497d356	format mergeable.yml	2023-02-20 11:49:59 +00:00
link2xt	0dd87b0bae	ci: format .yml with prettier	2023-02-20 11:48:57 +00:00
link2xt	e2151e26ee	ci: pin rustfmt version	2023-02-19 23:40:04 +00:00
link2xt	446214fd7b	sql: use transaction in Contact::add_or_lookup()	2023-02-19 23:16:44 +00:00
link2xt	9389e11007	ffi: log create_contact() errors	2023-02-19 23:16:44 +00:00
link2xt	5bdd49b451	Add Unreleased section to changelog	2023-02-19 21:57:36 +00:00
link2xt	42a7e91f05	python: stop using pytest-rerunfailures	2023-02-19 21:55:28 +00:00
link2xt	44953d6bcc	Release 1.109.0	2023-02-19 21:40:33 +00:00
link2xt	10066b2bc7	sql: use semaphore to limit access to the connection pool This ensures that if multiple connections are returned to the pool at the same time, waiters get them in the order they were placed in the queue.	2023-02-19 17:06:25 +00:00
Simon Laux	609fc67f0d	fix websocket server & add ci test for building it (#4047 ) the axum update broke the websocket server, because yerpc still uses a the old 5.9 version. So I needed to downgrade the dependency until https://github.com/deltachat/yerpc/pull/35 is merged. I want to retry the kaiOS client experiment, for this I need a working websocket server binary.	2023-02-19 14:57:00 +01:00
Hocuri	641d102aba	Add dc_msg_set_subject() C FFI (#4057 )	2023-02-19 13:42:39 +00:00
link2xt	f65e1c1587	Sort dependencies in Cargo.toml	2023-02-19 13:18:58 +00:00
link2xt	626ec5e793	Document the meaning of empty Message.subject	2023-02-19 13:05:39 +00:00
link2xt	85517abf58	Derive Debug for Pool	2023-02-19 02:26:26 +00:00
link2xt	75f65b06e8	Run VACUUM on the same connection as sqlcipher_export Otherwise export_and_import_backup test fails due to SQLITE_SCHEMA error.	2023-02-19 02:26:26 +00:00
link2xt	f2b05ccc29	Reimplement connection pool on top of crossbeam	2023-02-19 02:26:26 +00:00
link2xt	e88f21c010	Remove `try_many_times` r2d2 bug workaround	2023-02-19 02:26:26 +00:00
link2xt	ed8e2c4818	Replace r2d2 with an own connection pool New connection pool does not use threads and does not remove idle connections or create new connections at runtime.	2023-02-19 02:26:26 +00:00
link2xt	48fee4fc92	python: replace "while 1" with "while True" This makes pyright recognize that the function never returns implicitly.	2023-02-18 11:31:07 +00:00