remove all mentioning of clippy and checks

remove one more
and another one bites
2026-06-29 19:16:35 +03:00 · 2020-06-17 18:53:09 +02:00 · 2020-06-17 18:14:05 +02:00 · 2020-06-17 17:48:43 +02:00 · 2020-06-17 17:04:49 +02:00 · 2020-06-17 16:28:38 +02:00
51 changed files with 1007 additions and 2027 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,8 +5,6 @@ on:
  push:
    branches:
      - master
-      - staging
-      - trying

 jobs:

@@ -20,25 +18,12 @@ jobs:
          profile: minimal
          toolchain: 1.43.1
          override: true
-      - run: rustup component add rustfmt
+      - run: rustup component add rustfmt 
      - uses: actions-rs/cargo@v1
        with:
          command: fmt
          args: --all -- --check

-  run_clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-            toolchain: 1.43.1
-            components: clippy
-            override: true
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-

  build_and_test:
    name: Build and test
@@ -75,12 +60,6 @@ jobs:
        path: target
        key: ${{ matrix.os }}-${{ matrix.rust }}-cargo-build-target-${{ hashFiles('**/Cargo.toml') }}

-    - name: check
-      uses: actions-rs/cargo@v1
-      with:
-        command:  check
-        args: --workspace --all --bins --examples --tests
-
    - name: tests
      uses: actions-rs/cargo@v1
      with:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,63 +1,5 @@
 # Changelog 

-## 1.40.0
-
- introduce ephemeral messages #1540 #1680 #1683 #1684 #1691 #1692
-
- `DC_MSG_ID_DAYMARKER` gets timestamp attached #1677 #1685
-
- improve idle #1690 #1688
-
- refactorings #1670 #1673
-
-
-## 1.39.0
-
- fix handling of `mvbox_watch`, `sentbox_watch`, `inbox_watch` #1654 #1658
-
- fix potential panics, update dependencies #1650 #1655
-
-
-## 1.38.0
-
- fix sorting, esp. for multi-device
-
-
-## 1.37.0
-
- improve ndn heuristics #1630
-
- get oauth2 authorizer from provider-db #1641
-
- removed linebreaks and spaces from generated qr-code #1631
-
- more fixes #1633 #1635 #1636 #1637
-
-
-## 1.36.0
-
- parse ndn (network delivery notification) reports
-  and report failed messages as such #1552 #1622 #1630
-
- add oauth2 support for gsuite domains #1626
-
- read image orientation from exif before recoding #1619
-
- improve logging #1593 #1598
-
- improve python and bot bindings #1583 #1609
-
- improve imap logout #1595
-
- fix sorting #1600 #1604
-
- fix qr code generation #1631
-
- update rustcrypto releases #1603
-
- refactorings #1617
-
-
 ## 1.35.0

 - enable strict-tls from a new provider-db setting #1587
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,9 +2,9 @@
 # It is not intended for manual editing.
 [[package]]
 name = "addr2line"
-version = "0.12.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c"
+checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543"
 dependencies = [
 "gimli",
 ]
@@ -238,9 +238,9 @@ dependencies = [

 [[package]]
 name = "async-std"
-version = "1.6.2"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d68a33ebc8b57800847d00787307f84a562224a14db069b0acefe4c2abbf5d"
+checksum = "b93c583a035d21e6d6f09adf48abfc55277bf48886406df370e5db6babe3ab98"
 dependencies = [
 "async-attributes",
 "async-task",
@@ -281,9 +281,9 @@ checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3"

 [[package]]
 name = "async-trait"
-version = "0.1.36"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92"
+checksum = "89cb5d814ab2a47fd66d3266e9efccb53ca4c740b7451043b8ffcf9a6208f3f8"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -459,19 +459,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c98bfd7c112b6399fef97cc0614af1cd375b27a112e552ce60f94c1b5f13cb74"

-[[package]]
-name = "blocking"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d17efb70ce4421e351d61aafd90c16a20fb5bfe339fcdc32a86816280e62ce0"
-dependencies = [
- "futures-channel",
- "futures-util",
- "once_cell",
- "parking",
- "waker-fn",
-]
-
 [[package]]
 name = "blowfish"
 version = "0.5.0"
@@ -549,12 +536,6 @@ dependencies = [
 "iovec",
 ]

-[[package]]
-name = "cache-padded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24508e28c677875c380c20f4d28124fab6f8ed4ef929a1397d7b1a31e92f1005"
-
 [[package]]
 name = "cargo_metadata"
 version = "0.6.4"
@@ -652,15 +633,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"

-[[package]]
-name = "concurrent-queue"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83c06aff61f2d899eb87c379df3cbf7876f14471dcab474e0b6dc90ab96c080"
-dependencies = [
- "cache-padded",
-]
-
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -714,6 +686,32 @@ dependencies = [
 "cfg-if",
 ]

+[[package]]
+name = "crossbeam-deque"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "maybe-uninit",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+dependencies = [
+ "autocfg 1.0.0",
+ "cfg-if",
+ "crossbeam-utils",
+ "lazy_static",
+ "maybe-uninit",
+ "memoffset",
+ "scopeguard",
+]
+
 [[package]]
 name = "crossbeam-queue"
 version = "0.2.3"
@@ -804,12 +802,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "data-encoding"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72aa14c04dfae8dd7d8a2b1cb7ca2152618cd01336dbfe704b8dcbf8d41dbd69"
-
 [[package]]
 name = "deflate"
 version = "0.8.4"
@@ -822,7 +814,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.40.0"
+version = "1.35.0"
 dependencies = [
 "ansi_term 0.12.1",
 "anyhow",
@@ -894,7 +886,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.40.0"
+version = "1.35.0"
 dependencies = [
 "anyhow",
 "async-std",
@@ -985,9 +977,9 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"

 [[package]]
 name = "dtoa"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
+checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"

 [[package]]
 name = "ed25519-dalek"
@@ -1186,12 +1178,6 @@ dependencies = [
 "ascii_utils",
 ]

-[[package]]
-name = "fastrand"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64b0126b293b050395b37b10489951590ed024c03d7df4f249d219c8ded7cbf"
-
 [[package]]
 name = "flate2"
 version = "1.0.14"
@@ -1503,9 +1489,9 @@ dependencies = [

 [[package]]
 name = "http-types"
-version = "2.2.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca4221cd1c7cedf275cd0ad3c9dfe58b5acc93cdd5511c7e020a102e1995fe99"
+checksum = "9a89eaaf43f3700e78c01cb8165d1bd05155065637d26ee2f49800c95e7b62ee"
 dependencies = [
 "anyhow",
 "async-std",
@@ -1515,7 +1501,6 @@ dependencies = [
 "rand 0.7.3",
 "serde",
 "serde_json",
- "serde_qs",
 "serde_urlencoded",
 "url",
 ]
@@ -1569,9 +1554,9 @@ dependencies = [

 [[package]]
 name = "image"
-version = "0.23.6"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b0553fec6407d63fe2975b794dfb099f3f790bdc958823851af37b26404ab4"
+checksum = "d534e95ad8b9d5aa614322d02352b4f1bf962254adcf02ac6f2def8be18498e8"
 dependencies = [
 "bytemuck",
 "byteorder",
@@ -1614,9 +1599,12 @@ dependencies = [

 [[package]]
 name = "infer"
-version = "0.1.7"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6854dd77ddc4f9ba1a448f487e27843583d407648150426a30c2ea3a2c39490a"
+checksum = "d55c406a76164eb346a829ed4b97b73cb06259078eca01adeb12e8ca308d4123"
+dependencies = [
+ "byteorder",
+]

 [[package]]
 name = "iovec"
@@ -1650,9 +1638,9 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"

 [[package]]
 name = "jpeg-decoder"
@@ -1850,6 +1838,15 @@ version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"

+[[package]]
+name = "memoffset"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
+dependencies = [
+ "autocfg 1.0.0",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.16"
@@ -1997,9 +1994,9 @@ dependencies = [

 [[package]]
 name = "num-rational"
-version = "0.3.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138"
+checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
 "autocfg 1.0.0",
 "num-integer",
@@ -2113,12 +2110,6 @@ dependencies = [
 "cfg-if",
 ]

-[[package]]
-name = "parking"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a7fad362df89617628a7508b3e9d588ade1b0ac31aa25de168193ad999c2dd4"
-
 [[package]]
 name = "parking_lot"
 version = "0.10.2"
@@ -2240,6 +2231,18 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

+[[package]]
+name = "piper"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01608bfa680dafb103f9207fa944facf572e4e3e708d10de19a0d0c3d36e5f18"
+dependencies = [
+ "crossbeam-utils",
+ "futures-io",
+ "futures-sink",
+ "futures-util",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.17"
@@ -2716,10 +2719,10 @@ dependencies = [
 ]

 [[package]]
-name = "scoped-tls"
-version = "1.0.0"
+name = "scoped-tls-hkt"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+checksum = "c2e9d7eaddb227e8fbaaa71136ae0e1e913ca159b86c7da82f3e8f0044ad3a63"

 [[package]]
 name = "scopeguard"
@@ -2774,18 +2777,18 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"

 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.114"
+version = "1.0.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2803,18 +2806,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_qs"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e32b85107a5c8062643265a90575cc6e798cec0906ea58519b42175062ba27"
-dependencies = [
- "data-encoding",
- "error-chain",
- "percent-encoding",
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.6.1"
@@ -2923,23 +2914,23 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"

 [[package]]
 name = "smol"
-version = "0.1.18"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5"
+checksum = "afcf8beb4aa23cc616e3351e49585153b462637c8fec929163b54d88e522b3b0"
 dependencies = [
 "async-task",
- "blocking",
- "concurrent-queue",
- "fastrand",
+ "crossbeam-deque",
+ "crossbeam-queue",
+ "crossbeam-utils",
 "futures-io",
 "futures-util",
 "libc",
 "once_cell",
- "scoped-tls",
+ "piper",
+ "scoped-tls-hkt",
 "slab",
 "socket2",
- "wepoll-sys-stjepang",
- "winapi",
+ "wepoll-binding",
 ]

 [[package]]
@@ -3107,9 +3098,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.33"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
+checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3238,12 +3229,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "tinyvec"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
-
 [[package]]
 name = "tokio-io"
 version = "0.1.13"
@@ -3348,11 +3333,11 @@ dependencies = [

 [[package]]
 name = "unicode-normalization"
-version = "0.1.13"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
 dependencies = [
- "tinyvec",
+ "smallvec",
 ]

 [[package]]
@@ -3442,12 +3427,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "waker-fn"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7"
-
 [[package]]
 name = "walkdir"
 version = "2.3.1"
@@ -3542,10 +3521,20 @@ dependencies = [
 ]

 [[package]]
-name = "wepoll-sys-stjepang"
-version = "1.0.2"
+name = "wepoll-binding"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "035f8ab1fcf98d41f8fd5206a97c335604162e5eb0c25c4839062093150ddc79"
+checksum = "374fff4ff9701ff8b6ad0d14bacd3156c44063632d8c136186ff5967d48999a7"
+dependencies = [
+ "bitflags",
+ "wepoll-sys",
+]
+
+[[package]]
+name = "wepoll-sys"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9082a777aed991f6769e2b654aa0cb29f1c3d615daf009829b07b66c7aff6a24"
 dependencies = [
 "cc",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "deltachat"
-version = "1.40.0"
+version = "1.35.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL-2.0"

 [profile.release]
-#lto = true
+lto = true

 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
--- a/README.md
+++ b/README.md
@@ -123,7 +123,6 @@ Language bindings are available for:
 - [Node.js](https://www.npmjs.com/package/deltachat-node)
 - [Python](https://py.delta.chat)
 - [Go](https://github.com/hugot/go-deltachat/)
- [Free Pascal](https://github.com/deltachat/deltachat-fp/)
 - **Java** and **Swift** (contained in the Android/iOS repos)

 The following "frontend" projects make use of the Rust-library
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.40.0"
+version = "1.35.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -262,25 +262,17 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 * - `selfavatar`   = File containing avatar. Will immediately be copied to the 
 *                    `blobdir`; the original image will not be needed anymore.
 *                    NULL to remove the avatar.
- *                    As for `displayname` and `selfstatus`, also the avatar is sent to the recipients.
- *                    To save traffic, however, the avatar is attached only as needed
- *                    and also recoded to a reasonable size.
+ *                    It is planned for future versions
+ *                    to send this image together with the next messages.
 * - `e2ee_enabled` = 0=no end-to-end-encryption, 1=prefer end-to-end-encryption (default)
 * - `mdns_enabled` = 0=do not send or request read receipts,
 *                    1=send and request read receipts (default)
- * - `bcc_self`     = 0=do not send a copy of outgoing messages to self (default),
- *                    1=send a copy of outgoing messages to self.
- *                    Sending messages to self is needed for a proper multi-account setup,
- *                    however, on the other hand, may lead to unwanted notifications in non-delta clients.
 * - `inbox_watch`  = 1=watch `INBOX`-folder for changes (default),
- *                    0=do not watch the `INBOX`-folder,
- *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
+ *                    0=do not watch the `INBOX`-folder
 * - `sentbox_watch`= 1=watch `Sent`-folder for changes (default),
- *                    0=do not watch the `Sent`-folder,
- *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
+ *                    0=do not watch the `Sent`-folder
 * - `mvbox_watch`  = 1=watch `DeltaChat`-folder for changes (default),
- *                    0=do not watch the `DeltaChat`-folder,
- *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
+ *                    0=do not watch the `DeltaChat`-folder
 * - `mvbox_move`   = 1=heuristically detect chat-messages
 *                    and move them to the `DeltaChat`-folder,
 *                    0=do not move chat-messages
@@ -977,7 +969,6 @@ dc_msg_t*       dc_get_draft                 (dc_context_t* context, uint32_t ch
 * @param chat_id The chat ID of which the messages IDs should be queried.
 * @param flags If set to DC_GCM_ADDDAYMARKER, the marker DC_MSG_ID_DAYMARKER will
 *     be added before each day (regarding the local timezone).  Set this to 0 if you do not want this behaviour.
- *     To get the concrete time of the marker, use dc_array_get_timestamp().
 * @param marker1before An optional message ID.  If set, the id DC_MSG_ID_MARKER1 will be added just
 *   before the given ID in the returned array.  Set this to 0 if you do not want this behaviour.
 * @return Array of message IDs, must be dc_array_unref()'d when no longer used.
@@ -1172,16 +1163,6 @@ void            dc_delete_chat               (dc_context_t* context, uint32_t ch
 */
 dc_array_t*     dc_get_chat_contacts         (dc_context_t* context, uint32_t chat_id);

-/**
- * Get the chat's ephemeral message timer.
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @param chat_id The chat ID.
- *
- * @return ephemeral timer value in seconds, 0 if the timer is disabled or if there is an error
- */
-uint32_t dc_get_chat_ephemeral_timer (dc_context_t* context, uint32_t chat_id);

 /**
 * Search messages containing the given query string.
@@ -1314,21 +1295,6 @@ int             dc_remove_contact_from_chat  (dc_context_t* context, uint32_t ch
 */
 int             dc_set_chat_name             (dc_context_t* context, uint32_t chat_id, const char* name);

-/**
- * Set the chat's ephemeral message timer.
- *
- * This timer is applied to all messages in a chat and starts when the
- * message is read. The setting is synchronized to all clients
- * participating in a chat.
- *
- * @memberof dc_context_t
- * @param context The context as created by dc_context_new().
- * @param chat_id The chat ID to set the ephemeral message timer for.
- * @param timer The timer value in seconds or 0 to disable the timer.
- *
- * @return 1=success, 0=error
- */
-int dc_set_chat_ephemeral_timer (dc_context_t* context, uint32_t chat_id, uint32_t timer);

 /**
 * Set group profile image.
@@ -2311,6 +2277,17 @@ int              dc_array_is_independent     (const dc_array_t* array, size_t in
 int              dc_array_search_id          (const dc_array_t* array, uint32_t needle, size_t* ret_index);


+/**
+ * Get raw pointer to the data.
+ *
+ * @memberof dc_array_t
+ * @param array The array object.
+ * @return Raw pointer to the array. You MUST NOT free the data. You MUST NOT access the data beyond the current item count.
+ *     It is not possible to enlarge the array this way.  Calling any other dc_array*()-function may discard the returned pointer.
+ */
+const uint32_t*  dc_array_get_raw            (const dc_array_t* array);
+
+
 /**
 * @class dc_chatlist_t
 *
@@ -4194,11 +4171,6 @@ void dc_event_unref(dc_event_t* event);
 */
 #define DC_EVENT_CHAT_MODIFIED            2020

-/**
- * Chat ephemeral timer changed.
- */
-#define DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED 2021
-

 /**
 * Contact(s) created, renamed, verified, blocked or deleted.
@@ -4335,7 +4307,7 @@ void dc_event_unref(dc_event_t* event);
 */

 /**
- * Provider works out-of-the-box.
+ * Prover works out-of-the-box.
 * This provider status is returned for provider where the login
 * works by just entering the name or the email-address.
 *
@@ -4481,15 +4453,8 @@ void dc_event_unref(dc_event_t* event);
 #define DC_STR_UNKNOWN_SENDER_FOR_CHAT    72
 #define DC_STR_SUBJECT_FOR_NEW_CONTACT    73
 #define DC_STR_FAILED_SENDING_TO          74
-#define DC_STR_EPHEMERAL_DISABLED         75
-#define DC_STR_EPHEMERAL_SECONDS          76
-#define DC_STR_EPHEMERAL_MINUTE           77
-#define DC_STR_EPHEMERAL_HOUR             78
-#define DC_STR_EPHEMERAL_DAY              79
-#define DC_STR_EPHEMERAL_WEEK             80
-#define DC_STR_EPHEMERAL_FOUR_WEEKS       81

-#define DC_STR_COUNT                      81
+#define DC_STR_COUNT                      74

 /*
 * @}
--- a/deltachat-ffi/src/dc_array.rs
+++ b/deltachat-ffi/src/dc_array.rs
@@ -1,56 +1,46 @@
-use crate::chat::ChatItem;
-use crate::constants::{DC_MSG_ID_DAYMARKER, DC_MSG_ID_MARKER1};
 use crate::location::Location;
-use crate::message::MsgId;

 /* * the structure behind dc_array_t */
 #[derive(Debug, Clone)]
 pub enum dc_array_t {
-    MsgIds(Vec<MsgId>),
-    Chat(Vec<ChatItem>),
    Locations(Vec<Location>),
    Uint(Vec<u32>),
 }

 impl dc_array_t {
-    pub(crate) fn get_id(&self, index: usize) -> u32 {
+    pub fn new(capacity: usize) -> Self {
+        dc_array_t::Uint(Vec::with_capacity(capacity))
+    }
+
+    /// Constructs a new, empty `dc_array_t` holding locations with specified `capacity`.
+    pub fn new_locations(capacity: usize) -> Self {
+        dc_array_t::Locations(Vec::with_capacity(capacity))
+    }
+
+    pub fn add_id(&mut self, item: u32) {
+        if let Self::Uint(array) = self {
+            array.push(item);
+        } else {
+            panic!("Attempt to add id to array of other type");
+        }
+    }
+
+    pub fn add_location(&mut self, location: Location) {
+        if let Self::Locations(array) = self {
+            array.push(location)
+        } else {
+            panic!("Attempt to add a location to array of other type");
+        }
+    }
+
+    pub fn get_id(&self, index: usize) -> u32 {
        match self {
-            Self::MsgIds(array) => array[index].to_u32(),
-            Self::Chat(array) => match array[index] {
-                ChatItem::Message { msg_id } => msg_id.to_u32(),
-                ChatItem::Marker1 => DC_MSG_ID_MARKER1,
-                ChatItem::DayMarker { .. } => DC_MSG_ID_DAYMARKER,
-            },
            Self::Locations(array) => array[index].location_id,
-            Self::Uint(array) => array[index],
+            Self::Uint(array) => array[index] as u32,
        }
    }

-    pub(crate) fn get_timestamp(&self, index: usize) -> Option<i64> {
-        match self {
-            Self::MsgIds(_) => None,
-            Self::Chat(array) => array.get(index).and_then(|item| match item {
-                ChatItem::Message { .. } => None,
-                ChatItem::Marker1 { .. } => None,
-                ChatItem::DayMarker { timestamp } => Some(*timestamp),
-            }),
-            Self::Locations(array) => array.get(index).map(|location| location.timestamp),
-            Self::Uint(_) => None,
-        }
-    }
-
-    pub(crate) fn get_marker(&self, index: usize) -> Option<&str> {
-        match self {
-            Self::MsgIds(_) => None,
-            Self::Chat(_) => None,
-            Self::Locations(array) => array
-                .get(index)
-                .and_then(|location| location.marker.as_deref()),
-            Self::Uint(_) => None,
-        }
-    }
-
-    pub(crate) fn get_location(&self, index: usize) -> &Location {
+    pub fn get_location(&self, index: usize) -> &Location {
        if let Self::Locations(array) = self {
            &array[index]
        } else {
@@ -58,18 +48,55 @@ impl dc_array_t {
        }
    }

-    /// Returns the number of elements in the array.
-    pub(crate) fn len(&self) -> usize {
+    pub fn is_empty(&self) -> bool {
+        match self {
+            Self::Locations(array) => array.is_empty(),
+            Self::Uint(array) => array.is_empty(),
+        }
+    }
+
+    /// Returns the number of elements in the array.
+    pub fn len(&self) -> usize {
        match self {
-            Self::MsgIds(array) => array.len(),
-            Self::Chat(array) => array.len(),
            Self::Locations(array) => array.len(),
            Self::Uint(array) => array.len(),
        }
    }

-    pub(crate) fn search_id(&self, needle: u32) -> Option<usize> {
-        (0..self.len()).find(|i| self.get_id(*i) == needle)
+    pub fn clear(&mut self) {
+        match self {
+            Self::Locations(array) => array.clear(),
+            Self::Uint(array) => array.clear(),
+        }
+    }
+
+    pub fn search_id(&self, needle: u32) -> Option<usize> {
+        if let Self::Uint(array) = self {
+            for (i, &u) in array.iter().enumerate() {
+                if u == needle {
+                    return Some(i);
+                }
+            }
+            None
+        } else {
+            panic!("Attempt to search for id in array of other type");
+        }
+    }
+
+    pub fn sort_ids(&mut self) {
+        if let dc_array_t::Uint(v) = self {
+            v.sort();
+        } else {
+            panic!("Attempt to sort array of something other than uints");
+        }
+    }
+
+    pub fn as_ptr(&self) -> *const u32 {
+        if let dc_array_t::Uint(v) = self {
+            v.as_ptr()
+        } else {
+            panic!("Attempt to convert array of something other than uints to raw");
+        }
    }
 }

@@ -79,18 +106,6 @@ impl From<Vec<u32>> for dc_array_t {
    }
 }

-impl From<Vec<MsgId>> for dc_array_t {
-    fn from(array: Vec<MsgId>) -> Self {
-        dc_array_t::MsgIds(array)
-    }
-}
-
-impl From<Vec<ChatItem>> for dc_array_t {
-    fn from(array: Vec<ChatItem>) -> Self {
-        dc_array_t::Chat(array)
-    }
-}
-
 impl From<Vec<Location>> for dc_array_t {
    fn from(array: Vec<Location>) -> Self {
        dc_array_t::Locations(array)
@@ -103,11 +118,12 @@ mod tests {

    #[test]
    fn test_dc_array() {
-        let arr: dc_array_t = Vec::<u32>::new().into();
-        assert!(arr.len() == 0);
+        let mut arr = dc_array_t::new(7);
+        assert!(arr.is_empty());

-        let ids: Vec<u32> = (2..1002).collect();
-        let arr: dc_array_t = ids.into();
+        for i in 0..1000 {
+            arr.add_id(i + 2);
+        }

        assert_eq!(arr.len(), 1000);

@@ -115,15 +131,31 @@ mod tests {
            assert_eq!(arr.get_id(i), (i + 2) as u32);
        }

-        assert_eq!(arr.search_id(10), Some(8));
-        assert_eq!(arr.search_id(1), None);
+        arr.clear();
+
+        assert!(arr.is_empty());
+
+        arr.add_id(13);
+        arr.add_id(7);
+        arr.add_id(666);
+        arr.add_id(0);
+        arr.add_id(5000);
+
+        arr.sort_ids();
+
+        assert_eq!(arr.get_id(0), 0);
+        assert_eq!(arr.get_id(1), 7);
+        assert_eq!(arr.get_id(2), 13);
+        assert_eq!(arr.get_id(3), 666);
    }

    #[test]
    #[should_panic]
    fn test_dc_array_out_of_bounds() {
-        let ids: Vec<u32> = (2..1002).collect();
-        let arr: dc_array_t = ids.into();
+        let mut arr = dc_array_t::new(7);
+        for i in 0..1000 {
+            arr.add_id(i + 2);
+        }
        arr.get_id(1000);
    }
 }
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -27,7 +27,6 @@ use deltachat::chat::{ChatId, ChatVisibility, MuteDuration};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
 use deltachat::contact::{Contact, Origin};
 use deltachat::context::Context;
-use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
 use deltachat::stock::StockMessage;
@@ -127,7 +126,7 @@ pub unsafe extern "C" fn dc_set_config(
        // When ctx.set_config() fails it already logged the error.
        // TODO: Context::set_config() should not log this
        Ok(key) => block_on(async move {
-            ctx.set_config(key, to_opt_string_lossy(value).as_deref())
+            ctx.set_config(key, to_opt_string_lossy(value).as_ref().map(|x| x.as_str()))
                .await
                .is_ok() as libc::c_int
        }),
@@ -286,7 +285,7 @@ pub unsafe extern "C" fn dc_start_io(context: *mut dc_context_t) {
    }
    let ctx = &*context;

-    block_on(ctx.start_io())
+    block_on({ ctx.start_io() })
 }

 #[no_mangle]
@@ -296,7 +295,7 @@ pub unsafe extern "C" fn dc_is_io_running(context: *mut dc_context_t) -> libc::c
    }
    let ctx = &*context;

-    block_on(ctx.is_io_running()) as libc::c_int
+    block_on({ ctx.is_io_running() }) as libc::c_int
 }

 #[no_mangle]
@@ -350,8 +349,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | Event::MsgDelivered { chat_id, .. }
        | Event::MsgFailed { chat_id, .. }
        | Event::MsgRead { chat_id, .. }
-        | Event::ChatModified(chat_id)
-        | Event::ChatEphemeralTimerModified { chat_id, .. } => chat_id.to_u32() as libc::c_int,
+        | Event::ChatModified(chat_id) => chat_id.to_u32() as libc::c_int,
        Event::ContactsChanged(id) | Event::LocationChanged(id) => {
            let id = id.unwrap_or_default();
            id as libc::c_int
@@ -401,7 +399,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | Event::MsgRead { msg_id, .. } => msg_id.to_u32() as libc::c_int,
        Event::SecurejoinInviterProgress { progress, .. }
        | Event::SecurejoinJoinerProgress { progress, .. } => *progress as libc::c_int,
-        Event::ChatEphemeralTimerModified { timer, .. } => *timer as libc::c_int,
    }
 }

@@ -442,8 +439,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | Event::ConfigureProgress(_)
        | Event::ImexProgress(_)
        | Event::SecurejoinInviterProgress { .. }
-        | Event::SecurejoinJoinerProgress { .. }
-        | Event::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
+        | Event::SecurejoinJoinerProgress { .. } => ptr::null_mut(),
        Event::ImexFileWritten(file) => {
            let data2 = file.to_c_string().unwrap_or_default();
            data2.into_raw()
@@ -558,7 +554,14 @@ pub unsafe extern "C" fn dc_get_chatlist(
    let qi = if query_id == 0 { None } else { Some(query_id) };

    block_on(async move {
-        match chatlist::Chatlist::try_load(&ctx, flags as usize, qs.as_deref(), qi).await {
+        match chatlist::Chatlist::try_load(
+            &ctx,
+            flags as usize,
+            qs.as_ref().map(|x| x.as_str()),
+            qi,
+        )
+        .await
+        {
            Ok(list) => {
                let ffi_list = ChatlistWrapper { context, list };
                Box::into_raw(Box::new(ffi_list))
@@ -749,9 +752,13 @@ pub unsafe extern "C" fn dc_add_device_msg(
    };

    block_on(async move {
-        chat::add_device_msg(&ctx, to_opt_string_lossy(label).as_deref(), msg)
-            .await
-            .unwrap_or_log_default(&ctx, "Failed to add device message")
+        chat::add_device_msg(
+            &ctx,
+            to_opt_string_lossy(label).as_ref().map(|x| x.as_str()),
+            msg,
+        )
+        .await
+        .unwrap_or_log_default(&ctx, "Failed to add device message")
    })
    .to_u32()
 }
@@ -834,11 +841,14 @@ pub unsafe extern "C" fn dc_get_chat_msgs(
    };

    block_on(async move {
-        Box::into_raw(Box::new(
+        let arr = dc_array_t::from(
            chat::get_chat_msgs(&ctx, ChatId::new(chat_id), flags, marker_flag)
                .await
-                .into(),
-        ))
+                .iter()
+                .map(|msg_id| msg_id.to_u32())
+                .collect::<Vec<u32>>(),
+        );
+        Box::into_raw(Box::new(arr))
    })
 }

@@ -967,7 +977,7 @@ pub unsafe extern "C" fn dc_get_chat_media(
        from_prim(or_msg_type3).expect(&format!("incorrect or_msg_type3 = {}", or_msg_type3));

    block_on(async move {
-        Box::into_raw(Box::new(
+        let arr = dc_array_t::from(
            chat::get_chat_media(
                &ctx,
                ChatId::new(chat_id),
@@ -976,8 +986,11 @@ pub unsafe extern "C" fn dc_get_chat_media(
                or_msg_type3,
            )
            .await
-            .into(),
-        ))
+            .iter()
+            .map(|msg_id| msg_id.to_u32())
+            .collect::<Vec<u32>>(),
+        );
+        Box::into_raw(Box::new(arr))
    })
 }

@@ -1283,49 +1296,6 @@ pub unsafe extern "C" fn dc_set_chat_mute_duration(
    })
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_get_chat_ephemeral_timer(
-    context: *mut dc_context_t,
-    chat_id: u32,
-) -> u32 {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_chat_ephemeral_timer()");
-        return 0;
-    }
-    let ctx = &*context;
-
-    // Timer value 0 is returned in the rare case of a database error,
-    // but it is not dangerous since it is only meant to be used as a
-    // default when changing the value. Such errors should not be
-    // ignored when ephemeral timer value is used to construct
-    // message headers.
-    block_on(async move { ChatId::new(chat_id).get_ephemeral_timer(ctx).await })
-        .log_err(ctx, "Failed to get ephemeral timer")
-        .unwrap_or_default()
-        .to_u32()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_set_chat_ephemeral_timer(
-    context: *mut dc_context_t,
-    chat_id: u32,
-    timer: u32,
-) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_set_chat_ephemeral_timer()");
-        return 0;
-    }
-    let ctx = &*context;
-
-    block_on(async move {
-        ChatId::new(chat_id)
-            .set_ephemeral_timer(ctx, EphemeralTimer::from_u32(timer))
-            .await
-            .log_err(ctx, "Failed to set ephemeral timer")
-            .is_ok() as libc::c_int
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_msg_info(
    context: *mut dc_context_t,
@@ -1859,11 +1829,7 @@ pub unsafe extern "C" fn dc_send_locations_to_chat(
    }
    let ctx = &*context;

-    block_on(location::send_locations_to_chat(
-        &ctx,
-        ChatId::new(chat_id),
-        seconds as i64,
-    ));
+    block_on({ location::send_locations_to_chat(&ctx, ChatId::new(chat_id), seconds as i64) });
 }

 #[no_mangle]
@@ -2021,7 +1987,7 @@ pub unsafe extern "C" fn dc_array_get_timestamp(
        return 0;
    }

-    (*array).get_timestamp(index).unwrap_or_default()
+    (*array).get_location(index).timestamp
 }
 #[no_mangle]
 pub unsafe extern "C" fn dc_array_get_chat_id(
@@ -2068,7 +2034,7 @@ pub unsafe extern "C" fn dc_array_get_marker(
        return std::ptr::null_mut(); // NULL explicitly defined as "no markers"
    }

-    if let Some(s) = (*array).get_marker(index) {
+    if let Some(s) = &(*array).get_location(index).marker {
        s.strdup()
    } else {
        std::ptr::null_mut()
@@ -2096,6 +2062,16 @@ pub unsafe extern "C" fn dc_array_search_id(
    }
 }

+#[no_mangle]
+pub unsafe extern "C" fn dc_array_get_raw(array: *const dc_array_t) -> *const u32 {
+    if array.is_null() {
+        eprintln!("ignoring careless call to dc_array_get_raw()");
+        return ptr::null_mut();
+    }
+
+    (*array).as_ptr()
+}
+
 // Return the independent-state of the location at the given index.
 // Independent locations do not belong to the track of the user.
 // Returns 1 if location belongs to the track of the user,
@@ -2836,7 +2812,7 @@ pub unsafe extern "C" fn dc_msg_set_file(
    let ffi_msg = &mut *msg;
    ffi_msg.message.set_file(
        to_string_lossy(file),
-        to_opt_string_lossy(filemime).as_deref(),
+        to_opt_string_lossy(filemime).as_ref().map(|x| x.as_str()),
    )
 }

--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -488,7 +488,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        }
        "listchats" | "listarchived" | "chats" => {
            let listflags = if arg0 == "listarchived" { 0x01 } else { 0 };
-            let time_start = std::time::SystemTime::now();
            let chatlist = Chatlist::try_load(
                &context,
                listflags,
@@ -496,9 +495,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                None,
            )
            .await?;
-            let time_needed = std::time::SystemTime::now()
-                .duration_since(time_start)
-                .unwrap_or_default();

            let cnt = chatlist.len();
            if cnt > 0 {
@@ -557,7 +553,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                println!("Location streaming enabled.");
            }
            println!("{} chats", cnt);
-            println!("{:?} to create this list", time_needed);
        }
        "chat" => {
            if sel_chat.is_none() && arg1.is_empty() {
--- a/python/src/deltachat/chat.py
+++ b/python/src/deltachat/chat.py
@@ -139,22 +139,6 @@ class Chat(object):
        """
        return bool(lib.dc_chat_get_remaining_mute_duration(self.id))

-    def get_ephemeral_timer(self):
-        """ get ephemeral timer.
-
-        :returns: ephemeral timer value in seconds
-        """
-        return lib.dc_get_chat_ephemeral_timer(self.account._dc_context, self.id)
-
-    def set_ephemeral_timer(self, timer):
-        """ set ephemeral timer.
-
-        :param: timer value in seconds
-
-        :returns: None
-        """
-        return lib.dc_set_chat_ephemeral_timer(self.account._dc_context, self.id, timer)
-
    def get_type(self):
        """ (deprecated) return type of this chat.

--- a/python/src/deltachat/testplugin.py
+++ b/python/src/deltachat/testplugin.py
@@ -349,7 +349,6 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
                if hasattr(acc, "_configtracker"):
                    acc._configtracker.wait_finish()
                    del acc._configtracker
-                acc.set_config("bcc_self", "0")
                if acc.is_configured() and not acc.is_started():
                    acc.start_io()
                print("{}: {} account was successfully setup".format(
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -723,9 +723,9 @@ class TestOnlineAccount:

    def test_move_works_on_self_sent(self, acfactory):
        ac1 = acfactory.get_online_configuring_account(mvbox=True, move=True)
+        ac1.set_config("bcc_self", "1")
        ac2 = acfactory.get_online_configuring_account()
        acfactory.wait_configure_and_start_io()
-        ac1.set_config("bcc_self", "1")

        chat = acfactory.get_accepted_chat(ac1, ac2)
        chat.send_text("message1")
@@ -1542,56 +1542,6 @@ class TestOnlineAccount:
        assert msg.is_encrypted(), "Message is not encrypted"
        assert msg.chat == ac2.create_chat(ac4)

-    def test_ephemeral_timer(self, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-
-        lp.sec("ac1: create chat with ac2")
-        chat1 = ac1.create_chat(ac2)
-        chat2 = ac2.create_chat(ac1)
-
-        lp.sec("ac1: set ephemeral timer to 60")
-        chat1.set_ephemeral_timer(60)
-
-        lp.sec("ac1: check that ephemeral timer is set for chat")
-        assert chat1.get_ephemeral_timer() == 60
-        chat1_summary = chat1.get_summary()
-        assert chat1_summary["ephemeral_timer"] == {'Enabled': {'duration': 60}}
-
-        lp.sec("ac2: receive system message about ephemeral timer modification")
-        ac2._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
-        system_message1 = ac2._evtracker.wait_next_incoming_message()
-        assert chat2.get_ephemeral_timer() == 60
-        assert system_message1.is_system_message()
-
-        # Disabled until markers are implemented
-        # assert "Ephemeral timer: 60\n" in system_message1.get_message_info()
-
-        lp.sec("ac2: send message to ac1")
-        sent_message = chat2.send_text("message")
-        assert "Ephemeral timer: 60\n" in sent_message.get_message_info()
-
-        # Timer is started immediately for sent messages
-        assert "Expires: " in sent_message.get_message_info()
-
-        lp.sec("ac1: waiting for message from ac2")
-        text_message = ac1._evtracker.wait_next_incoming_message()
-        assert text_message.text == "message"
-        assert "Ephemeral timer: 60\n" in text_message.get_message_info()
-
-        # Timer should not start until message is displayed
-        assert "Expires: " not in text_message.get_message_info()
-        text_message.mark_seen()
-        assert "Expires: " in text_message.get_message_info()
-
-        lp.sec("ac2: set ephemeral timer to 0")
-        chat2.set_ephemeral_timer(0)
-
-        lp.sec("ac1: receive system message about ephemeral timer modification")
-        ac1._evtracker.get_matching("DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED")
-        system_message2 = ac1._evtracker.wait_next_incoming_message()
-        assert "Ephemeral timer: " not in system_message2.get_message_info()
-        assert chat1.get_ephemeral_timer() == 0
-

 class TestGroupStressTests:
    def test_group_many_members_add_leave_remove(self, acfactory, lp):
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -497,7 +497,7 @@ mod tests {

    #[async_std::test]
    async fn test_create() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let blob = BlobObject::create(&t.ctx, "foo", b"hello").await.unwrap();
        let fname = t.ctx.get_blobdir().join("foo");
        let data = fs::read(fname).await.unwrap();
@@ -508,7 +508,7 @@ mod tests {

    #[async_std::test]
    async fn test_lowercase_ext() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let blob = BlobObject::create(&t.ctx, "foo.TXT", b"hello")
            .await
            .unwrap();
@@ -517,7 +517,7 @@ mod tests {

    #[async_std::test]
    async fn test_as_file_name() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello")
            .await
            .unwrap();
@@ -526,7 +526,7 @@ mod tests {

    #[async_std::test]
    async fn test_as_rel_path() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello")
            .await
            .unwrap();
@@ -535,7 +535,7 @@ mod tests {

    #[async_std::test]
    async fn test_suffix() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let blob = BlobObject::create(&t.ctx, "foo.txt", b"hello")
            .await
            .unwrap();
@@ -546,7 +546,7 @@ mod tests {

    #[async_std::test]
    async fn test_create_dup() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        BlobObject::create(&t.ctx, "foo.txt", b"hello")
            .await
            .unwrap();
@@ -570,7 +570,7 @@ mod tests {

    #[async_std::test]
    async fn test_double_ext_preserved() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        BlobObject::create(&t.ctx, "foo.tar.gz", b"hello")
            .await
            .unwrap();
@@ -595,7 +595,7 @@ mod tests {

    #[async_std::test]
    async fn test_create_long_names() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let s = "1".repeat(150);
        let blob = BlobObject::create(&t.ctx, &s, b"data").await.unwrap();
        let blobname = blob.as_name().split('/').last().unwrap();
@@ -604,7 +604,7 @@ mod tests {

    #[async_std::test]
    async fn test_create_and_copy() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let src = t.dir.path().join("src");
        fs::write(&src, b"boo").await.unwrap();
        let blob = BlobObject::create_and_copy(&t.ctx, &src).await.unwrap();
@@ -620,7 +620,7 @@ mod tests {

    #[async_std::test]
    async fn test_create_from_path() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        let src_ext = t.dir.path().join("external");
        fs::write(&src_ext, b"boo").await.unwrap();
@@ -638,7 +638,7 @@ mod tests {
    }
    #[async_std::test]
    async fn test_create_from_name_long() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let src_ext = t.dir.path().join("autocrypt-setup-message-4137848473.html");
        fs::write(&src_ext, b"boo").await.unwrap();
        let blob = BlobObject::new_from_path(&t.ctx, &src_ext).await.unwrap();
@@ -660,40 +660,8 @@ mod tests {

    #[test]
    fn test_sanitise_name() {
-        let (stem, ext) =
+        let (_, ext) =
            BlobObject::sanitise_name("Я ЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯ.txt");
        assert_eq!(ext, ".txt");
-        assert!(!stem.is_empty());
-
-        // the extensions are kept together as between stem and extension a number may be added -
-        // and `foo.tar.gz` should become `foo-1234.tar.gz` and not `foo.tar-1234.gz`
-        let (stem, ext) = BlobObject::sanitise_name("wot.tar.gz");
-        assert_eq!(stem, "wot");
-        assert_eq!(ext, ".tar.gz");
-
-        let (stem, ext) = BlobObject::sanitise_name(".foo.bar");
-        assert_eq!(stem, "");
-        assert_eq!(ext, ".foo.bar");
-
-        let (stem, ext) = BlobObject::sanitise_name("foo?.bar");
-        assert!(stem.contains("foo"));
-        assert!(!stem.contains("?"));
-        assert_eq!(ext, ".bar");
-
-        let (stem, ext) = BlobObject::sanitise_name("no-extension");
-        assert_eq!(stem, "no-extension");
-        assert_eq!(ext, "");
-
-        let (stem, ext) = BlobObject::sanitise_name("path/ignored\\this: is* forbidden?.c");
-        assert_eq!(ext, ".c");
-        assert!(!stem.contains("path"));
-        assert!(!stem.contains("ignored"));
-        assert!(stem.contains("this"));
-        assert!(stem.contains("forbidden"));
-        assert!(!stem.contains("/"));
-        assert!(!stem.contains("\\"));
-        assert!(!stem.contains(":"));
-        assert!(!stem.contains("*"));
-        assert!(!stem.contains("?"));
    }
 }
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -15,7 +15,6 @@ use crate::constants::*;
 use crate::contact::*;
 use crate::context::Context;
 use crate::dc_tools::*;
-use crate::ephemeral::{delete_expired_messages, schedule_ephemeral_task, Timer as EphemeralTimer};
 use crate::error::{bail, ensure, format_err, Error};
 use crate::events::Event;
 use crate::job::{self, Action};
@@ -25,25 +24,6 @@ use crate::param::*;
 use crate::sql;
 use crate::stock::StockMessage;

-/// An chat item, such as a message or a marker.
-#[derive(Debug, Copy, Clone)]
-pub enum ChatItem {
-    Message {
-        msg_id: MsgId,
-    },
-
-    /// A marker without inherent meaning. It is inserted before user
-    /// supplied MsgId.
-    Marker1,
-
-    /// Day marker, separating messages that correspond to different
-    /// days according to local time.
-    DayMarker {
-        /// Marker timestamp, for day markers
-        timestamp: i64,
-    },
-}
-
 /// Chat ID, including reserved IDs.
 ///
 /// Some chat IDs are reserved to identify special chat types.  This
@@ -730,7 +710,6 @@ impl Chat {
                .unwrap_or_else(std::path::PathBuf::new),
            draft,
            is_muted: self.is_muted(),
-            ephemeral_timer: self.id.get_ephemeral_timer(context).await?,
        })
    }

@@ -959,20 +938,10 @@ impl Chat {
                    .await?;
            }

-            let ephemeral_timer = if msg.param.get_cmd() == SystemMessage::EphemeralTimerChanged {
-                EphemeralTimer::Disabled
-            } else {
-                self.id.get_ephemeral_timer(context).await?
-            };
-            let ephemeral_timestamp = match ephemeral_timer {
-                EphemeralTimer::Disabled => 0,
-                EphemeralTimer::Enabled { duration } => timestamp + i64::from(duration),
-            };
-
            // add message to the database

            if context.sql.execute(
-                        "INSERT INTO msgs (rfc724_mid, chat_id, from_id, to_id, timestamp, type, state, txt, param, hidden, mime_in_reply_to, mime_references, location_id, ephemeral_timer, ephemeral_timestamp) VALUES (?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?);",
+                        "INSERT INTO msgs (rfc724_mid, chat_id, from_id, to_id, timestamp, type, state, txt, param, hidden, mime_in_reply_to, mime_references, location_id) VALUES (?,?,?,?,?, ?,?,?,?,?, ?,?,?);",
                        paramsv![
                            new_rfc724_mid,
                            self.id,
@@ -987,8 +956,6 @@ impl Chat {
                            new_in_reply_to,
                            new_references,
                            location_id as i32,
-                            ephemeral_timer,
-                            ephemeral_timestamp
                        ]
                    ).await.is_ok() {
                        msg_id = context.sql.get_rowid(
@@ -1007,7 +974,6 @@ impl Chat {
        } else {
            error!(context, "Cannot send message, not configured.",);
        }
-        schedule_ephemeral_task(context).await;

        Ok(MsgId::new(msg_id))
    }
@@ -1035,13 +1001,13 @@ impl rusqlite::types::ToSql for ChatVisibility {

 impl rusqlite::types::FromSql for ChatVisibility {
    fn column_result(value: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
-        i64::column_result(value).map(|val| {
+        i64::column_result(value).and_then(|val| {
            match val {
-                2 => ChatVisibility::Pinned,
-                1 => ChatVisibility::Archived,
-                0 => ChatVisibility::Normal,
+                2 => Ok(ChatVisibility::Pinned),
+                1 => Ok(ChatVisibility::Archived),
+                0 => Ok(ChatVisibility::Normal),
                // fallback to to Normal for unknown values, may happen eg. on imports created by a newer version.
-                _ => ChatVisibility::Normal,
+                _ => Ok(ChatVisibility::Normal),
            }
        })
    }
@@ -1104,9 +1070,6 @@ pub struct ChatInfo {
    ///
    /// The exact time its muted can be found out via the `chat.mute_duration` property
    pub is_muted: bool,
-
-    /// Ephemeral message timer.
-    pub ephemeral_timer: EphemeralTimer,
    // ToDo:
    // - [ ] deaddrop,
    // - [ ] summary,
@@ -1617,16 +1580,11 @@ pub async fn get_chat_msgs(
    chat_id: ChatId,
    flags: u32,
    marker1before: Option<MsgId>,
-) -> Vec<ChatItem> {
-    match delete_expired_messages(context).await {
+) -> Vec<MsgId> {
+    match delete_device_expired_messages(context).await {
        Err(err) => warn!(context, "Failed to delete expired messages: {}", err),
        Ok(messages_deleted) => {
            if messages_deleted {
-                // Trigger reload of chatlist.
-                //
-                // On desktop chatlist is always shown on the side,
-                // and it is important to update the last message shown
-                // there.
                context.emit_event(Event::MsgsChanged {
                    msg_id: MsgId::new(0),
                    chat_id: ChatId::new(0),
@@ -1645,20 +1603,18 @@ pub async fn get_chat_msgs(
            let (curr_id, ts) = row?;
            if let Some(marker_id) = marker1before {
                if curr_id == marker_id {
-                    ret.push(ChatItem::Marker1);
+                    ret.push(MsgId::new(DC_MSG_ID_MARKER1));
                }
            }
            if (flags & DC_GCM_ADDDAYMARKER) != 0 {
                let curr_local_timestamp = ts + cnv_to_local;
                let curr_day = curr_local_timestamp / 86400;
                if curr_day != last_day {
-                    ret.push(ChatItem::DayMarker {
-                        timestamp: curr_day,
-                    });
+                    ret.push(MsgId::new(DC_MSG_ID_DAYMARKER));
                    last_day = curr_day;
                }
            }
-            ret.push(ChatItem::Message { msg_id: curr_id });
+            ret.push(curr_id);
        }
        Ok(ret)
    };
@@ -1790,6 +1746,52 @@ pub async fn marknoticed_all_chats(context: &Context) -> Result<(), Error> {
    Ok(())
 }

+/// Deletes messages which are expired according to "delete_device_after" setting.
+///
+/// Returns true if any message is deleted, so event can be emitted. If nothing
+/// has been deleted, returns false.
+pub async fn delete_device_expired_messages(context: &Context) -> Result<bool, Error> {
+    if let Some(delete_device_after) = context.get_config_delete_device_after().await {
+        let threshold_timestamp = time() - delete_device_after;
+
+        let self_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_SELF)
+            .await
+            .unwrap_or_default()
+            .0;
+        let device_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE)
+            .await
+            .unwrap_or_default()
+            .0;
+
+        // Delete expired messages
+        //
+        // Only update the rows that have to be updated, to avoid emitting
+        // unnecessary "chat modified" events.
+        let rows_modified = context
+            .sql
+            .execute(
+                "UPDATE msgs \
+             SET txt = 'DELETED', chat_id = ? \
+             WHERE timestamp < ? \
+             AND chat_id > ? \
+             AND chat_id != ? \
+             AND chat_id != ?",
+                paramsv![
+                    DC_CHAT_ID_TRASH,
+                    threshold_timestamp,
+                    DC_CHAT_ID_LAST_SPECIAL,
+                    self_chat_id,
+                    device_chat_id
+                ],
+            )
+            .await?;
+
+        Ok(rows_modified > 0)
+    } else {
+        Ok(false)
+    }
+}
+
 pub async fn get_chat_media(
    context: &Context,
    chat_id: ChatId,
@@ -2781,16 +2783,9 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
 /// For example, it can be a message showing that a member was added to a group.
 pub(crate) async fn add_info_msg(context: &Context, chat_id: ChatId, text: impl AsRef<str>) {
    let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
-    let ephemeral_timer = match chat_id.get_ephemeral_timer(context).await {
-        Err(e) => {
-            warn!(context, "Could not get timer for info msg: {}", e);
-            return;
-        }
-        Ok(ephemeral_timer) => ephemeral_timer,
-    };

    if let Err(e) = context.sql.execute(
-        "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,rfc724_mid,ephemeral_timer) VALUES (?,?,?, ?,?,?, ?,?,?);",
+        "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,rfc724_mid) VALUES (?,?,?, ?,?,?, ?,?);",
        paramsv![
            chat_id,
            DC_CONTACT_ID_INFO,
@@ -2800,7 +2795,6 @@ pub(crate) async fn add_info_msg(context: &Context, chat_id: ChatId, text: impl
            MessageState::InNoticed,
            text.as_ref().to_string(),
            rfc724_mid,
-            ephemeral_timer
        ]
    ).await {
        warn!(context, "Could not add info msg: {}", e);
@@ -2827,7 +2821,7 @@ mod tests {

    #[async_std::test]
    async fn test_chat_info() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let bob = Contact::create(&t.ctx, "bob", "bob@example.com")
            .await
            .unwrap();
@@ -2850,8 +2844,7 @@ mod tests {
                "color": 15895624,
                "profile_image": "",
                "draft": "",
-                "is_muted": false,
-                "ephemeral_timer": "Disabled"
+                "is_muted": false
            }
        "#;

@@ -2862,7 +2855,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_draft_no_draft() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id = create_by_contact_id(&t.ctx, DC_CONTACT_ID_SELF)
            .await
            .unwrap();
@@ -2872,7 +2865,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_draft_special_chat_id() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let draft = ChatId::new(DC_CHAT_ID_LAST_SPECIAL)
            .get_draft(&t.ctx)
            .await
@@ -2884,14 +2877,14 @@ mod tests {
    async fn test_get_draft_no_chat() {
        // This is a weird case, maybe this should be an error but we
        // do not get this info from the database currently.
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let draft = ChatId::new(42).get_draft(&t.ctx).await.unwrap();
        assert!(draft.is_none());
    }

    #[async_std::test]
    async fn test_get_draft() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id = create_by_contact_id(&t.ctx, DC_CONTACT_ID_SELF)
            .await
            .unwrap();
@@ -2907,7 +2900,7 @@ mod tests {
    #[async_std::test]
    async fn test_add_contact_to_chat_ex_add_self() {
        // Adding self to a contact should succeed, even though it's pointless.
-        let t = TestContext::new().await;
+        let t = test_context().await;
        let chat_id = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo")
            .await
            .unwrap();
@@ -2919,7 +2912,7 @@ mod tests {

    #[async_std::test]
    async fn test_self_talk() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id = create_by_contact_id(&t.ctx, DC_CONTACT_ID_SELF)
            .await
            .unwrap();
@@ -2940,7 +2933,7 @@ mod tests {

    #[async_std::test]
    async fn test_deaddrop_chat() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat = Chat::load_from_db(&t.ctx, ChatId::new(DC_CHAT_ID_DEADDROP))
            .await
            .unwrap();
@@ -2955,7 +2948,7 @@ mod tests {

    #[async_std::test]
    async fn test_add_device_msg_unlabelled() {
-        let t = TestContext::new().await;
+        let t = test_context().await;

        // add two device-messages
        let mut msg1 = Message::new(Viewtype::Text);
@@ -2990,7 +2983,7 @@ mod tests {

    #[async_std::test]
    async fn test_add_device_msg_labelled() {
-        let t = TestContext::new().await;
+        let t = test_context().await;

        // add two device-messages with the same label (second attempt is not added)
        let mut msg1 = Message::new(Viewtype::Text);
@@ -3044,7 +3037,7 @@ mod tests {

    #[async_std::test]
    async fn test_add_device_msg_label_only() {
-        let t = TestContext::new().await;
+        let t = test_context().await;
        let res = add_device_msg(&t.ctx, Some(""), None).await;
        assert!(res.is_err());
        let res = add_device_msg(&t.ctx, Some("some-label"), None).await;
@@ -3064,7 +3057,7 @@ mod tests {

    #[async_std::test]
    async fn test_was_device_msg_ever_added() {
-        let t = TestContext::new().await;
+        let t = test_context().await;
        add_device_msg(&t.ctx, Some("some-label"), None).await.ok();
        assert!(was_device_msg_ever_added(&t.ctx, "some-label")
            .await
@@ -3088,7 +3081,7 @@ mod tests {

    #[async_std::test]
    async fn test_delete_device_chat() {
-        let t = TestContext::new().await;
+        let t = test_context().await;

        let mut msg = Message::new(Viewtype::Text);
        msg.text = Some("message text".to_string());
@@ -3108,7 +3101,7 @@ mod tests {

    #[async_std::test]
    async fn test_device_chat_cannot_sent() {
-        let t = TestContext::new().await;
+        let t = test_context().await;
        t.ctx.update_device_chats().await.unwrap();
        let (device_chat_id, _) =
            create_or_lookup_by_contact_id(&t.ctx, DC_CONTACT_ID_DEVICE, Blocked::Not)
@@ -3128,7 +3121,7 @@ mod tests {

    #[async_std::test]
    async fn test_delete_and_reset_all_device_msgs() {
-        let t = TestContext::new().await;
+        let t = test_context().await;
        let mut msg = Message::new(Viewtype::Text);
        msg.text = Some("message text".to_string());
        let msg_id1 = add_device_msg(&t.ctx, Some("some-label"), Some(&mut msg))
@@ -3165,7 +3158,7 @@ mod tests {
    #[async_std::test]
    async fn test_archive() {
        // create two chats
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let mut msg = Message::new(Viewtype::Text);
        msg.text = Some("foo".to_string());
        let msg_id = add_device_msg(&t.ctx, None, Some(&mut msg)).await.unwrap();
@@ -3279,7 +3272,7 @@ mod tests {

    #[async_std::test]
    async fn test_pinned() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        // create 3 chats, wait 1 second in between to get a reliable order (we order by time)
        let mut msg = Message::new(Viewtype::Text);
@@ -3338,7 +3331,7 @@ mod tests {

    #[async_std::test]
    async fn test_set_chat_name() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo")
            .await
            .unwrap();
@@ -3362,7 +3355,7 @@ mod tests {

    #[async_std::test]
    async fn test_create_same_chat_twice() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let contact1 = Contact::create(&context.ctx, "bob", "bob@mail.de")
            .await
            .unwrap();
@@ -3381,7 +3374,7 @@ mod tests {

    #[async_std::test]
    async fn test_shall_attach_selfavatar() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo")
            .await
            .unwrap();
@@ -3405,7 +3398,7 @@ mod tests {

    #[async_std::test]
    async fn test_set_mute_duration() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo")
            .await
            .unwrap();
@@ -3473,7 +3466,7 @@ mod tests {

    #[async_std::test]
    async fn test_parent_is_encrypted() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "foo")
            .await
            .unwrap();
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -5,7 +5,6 @@ use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::*;
-use crate::ephemeral::delete_expired_messages;
 use crate::error::{bail, ensure, Result};
 use crate::lot::Lot;
 use crate::message::{Message, MessageState, MsgId};
@@ -77,7 +76,7 @@ impl Chatlist {
    ///   chats
    /// - the flag DC_GCL_FOR_FORWARDING sorts "Saved messages" to the top of the chatlist
    ///   and hides the device-chat,
-    ///   typically used on forwarding, may be combined with DC_GCL_NO_SPECIALS
+    //    typically used on forwarding, may be combined with DC_GCL_NO_SPECIALS
    /// - if the flag DC_GCL_NO_SPECIALS is set, deaddrop and archive link are not added
    ///   to the list (may be used eg. for selecting chats on forwarding, the flag is
    ///   not needed when DC_GCL_ARCHIVED_ONLY is already set)
@@ -100,7 +99,7 @@ impl Chatlist {

        // Note that we do not emit DC_EVENT_MSGS_MODIFIED here even if some
        // messages get deleted to avoid reloading the same chatlist.
-        if let Err(err) = delete_expired_messages(context).await {
+        if let Err(err) = delete_device_expired_messages(context).await {
            warn!(context, "Failed to hide expired messages: {}", err);
        }

@@ -148,12 +147,11 @@ impl Chatlist {
                 FROM chats c
                 LEFT JOIN msgs m
                        ON c.id=m.chat_id
-                       AND m.id=(
-                               SELECT id
+                       AND m.timestamp=(
+                               SELECT MAX(timestamp)
                                 FROM msgs
                                WHERE chat_id=c.id
-                                  AND (hidden=0 OR state=?1)
-                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
+                                  AND (hidden=0 OR state=?1))
                 WHERE c.id>9
                   AND c.blocked=0
                   AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?2)
@@ -175,12 +173,11 @@ impl Chatlist {
                 FROM chats c
                 LEFT JOIN msgs m
                        ON c.id=m.chat_id
-                       AND m.id=(
-                               SELECT id
+                       AND m.timestamp=(
+                               SELECT MAX(timestamp)
                                 FROM msgs
                                WHERE chat_id=c.id
-                                  AND (hidden=0 OR state=?)
-                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
+                                  AND (hidden=0 OR state=?))
                 WHERE c.id>9
                   AND c.blocked=0
                   AND c.archived=1
@@ -209,12 +206,11 @@ impl Chatlist {
                 FROM chats c
                 LEFT JOIN msgs m
                        ON c.id=m.chat_id
-                       AND m.id=(
-                               SELECT id
+                       AND m.timestamp=(
+                               SELECT MAX(timestamp)
                                 FROM msgs
                                WHERE chat_id=c.id
-                                  AND (hidden=0 OR state=?1)
-                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
+                                  AND (hidden=0 OR state=?1))
                 WHERE c.id>9 AND c.id!=?2
                   AND c.blocked=0
                   AND c.name LIKE ?3
@@ -240,12 +236,11 @@ impl Chatlist {
                 FROM chats c
                 LEFT JOIN msgs m
                        ON c.id=m.chat_id
-                       AND m.id=(
-                               SELECT id
+                       AND m.timestamp=(
+                               SELECT MAX(timestamp)
                                 FROM msgs
                                WHERE chat_id=c.id
-                                  AND (hidden=0 OR state=?1)
-                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
+                                  AND (hidden=0 OR state=?1))
                 WHERE c.id>9 AND c.id!=?2
                   AND c.blocked=0
                   AND NOT c.archived=?3
@@ -429,7 +424,7 @@ mod tests {

    #[async_std::test]
    async fn test_try_load() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id1 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "a chat")
            .await
            .unwrap();
@@ -477,7 +472,7 @@ mod tests {

    #[async_std::test]
    async fn test_sort_self_talk_up_on_forward() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx.update_device_chats().await.unwrap();
        create_group_chat(&t.ctx, VerifiedStatus::Unverified, "a chat")
            .await
@@ -502,7 +497,7 @@ mod tests {

    #[async_std::test]
    async fn test_search_special_chat_names() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx.update_device_chats().await.unwrap();

        let chats = Chatlist::try_load(&t.ctx, 0, Some("t-1234-s"), None)
@@ -535,7 +530,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_summary_unwrap() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let chat_id1 = create_group_chat(&t.ctx, VerifiedStatus::Unverified, "a chat")
            .await
            .unwrap();
--- a/src/config.rs
+++ b/src/config.rs
@@ -11,7 +11,7 @@ use crate::dc_tools::*;
 use crate::events::Event;
 use crate::message::MsgId;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
-use crate::stock::StockMessage;
+use crate::{scheduler::InterruptInfo, stock::StockMessage};

 /// The available configuration keys.
 #[derive(
@@ -120,10 +120,6 @@ pub enum Config {
 }

 impl Context {
-    pub async fn config_exists(&self, key: Config) -> bool {
-        self.sql.get_raw_config(self, key).await.is_some()
-    }
-
    /// Get a configuration key. Returns `None` if no value is set, and no default value found.
    pub async fn get_config(&self, key: Config) -> Option<String> {
        let value = match key {
@@ -205,6 +201,22 @@ impl Context {
                    None => self.sql.set_raw_config(self, key, None).await,
                }
            }
+            Config::InboxWatch => {
+                let ret = self.sql.set_raw_config(self, key, value).await;
+                self.interrupt_inbox(InterruptInfo::new(false, None)).await;
+                ret
+            }
+            Config::SentboxWatch => {
+                let ret = self.sql.set_raw_config(self, key, value).await;
+                self.interrupt_sentbox(InterruptInfo::new(false, None))
+                    .await;
+                ret
+            }
+            Config::MvboxWatch => {
+                let ret = self.sql.set_raw_config(self, key, value).await;
+                self.interrupt_mvbox(InterruptInfo::new(false, None)).await;
+                ret
+            }
            Config::Selfstatus => {
                let def = self.stock_str(StockMessage::StatusLine).await;
                let val = if value.is_none() || value.unwrap() == def {
@@ -274,7 +286,7 @@ mod tests {

    #[async_std::test]
    async fn test_selfavatar_outside_blobdir() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let avatar_src = t.dir.path().join("avatar.jpg");
        let avatar_bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
        File::create(&avatar_src)
@@ -303,7 +315,7 @@ mod tests {

    #[async_std::test]
    async fn test_selfavatar_in_blobdir() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let avatar_src = t.ctx.get_blobdir().join("avatar.png");
        let avatar_bytes = include_bytes!("../test-data/image/avatar900x900.png");
        File::create(&avatar_src)
@@ -329,7 +341,7 @@ mod tests {

    #[async_std::test]
    async fn test_selfavatar_copy_without_recode() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let avatar_src = t.dir.path().join("avatar.png");
        let avatar_bytes = include_bytes!("../test-data/image/avatar64x64.png");
        File::create(&avatar_src)
@@ -353,7 +365,7 @@ mod tests {

    #[async_std::test]
    async fn test_media_quality_config_option() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let media_quality = t.ctx.get_config_int(Config::MediaQuality).await;
        assert_eq!(media_quality, 0);
        let media_quality = constants::MediaQuality::from_i32(media_quality).unwrap_or_default();
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -1,7 +1,5 @@
 //! Email accounts autoconfiguration process module

-#![forbid(clippy::indexing_slicing)]
-
 mod auto_mozilla;
 mod auto_outlook;
 mod read_url;
@@ -70,20 +68,16 @@ impl Context {
    async fn inner_configure(&self) -> Result<()> {
        info!(self, "Configure ...");

+        let was_configured_before = self.is_configured().await;
        let mut param = LoginParam::from_database(self, "").await;
        let success = configure(self, &mut param).await;

        if let Some(provider) = provider::get_provider_info(&param.addr) {
-            if let Some(config_defaults) = &provider.config_defaults {
-                for def in config_defaults.iter() {
-                    if !self.config_exists(def.key).await {
+            if !was_configured_before {
+                if let Some(config_defaults) = &provider.config_defaults {
+                    for def in config_defaults.iter() {
                        info!(self, "apply config_defaults {}={}", def.key, def.value);
                        self.set_config(def.key, Some(def.value)).await?;
-                    } else {
-                        info!(
-                            self,
-                            "skip already set config_defaults {}={}", def.key, def.value
-                        );
                    }
                }
            }
@@ -627,7 +621,7 @@ mod tests {

    #[async_std::test]
    async fn test_no_panic_on_bad_credentials() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx
            .set_config(Config::Addr, Some("probably@unexistant.addr"))
            .await
@@ -641,7 +635,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_offline_autoconfig() {
-        let context = TestContext::new().await.ctx;
+        let context = dummy_context().await.ctx;

        let mut params = LoginParam::new();
        params.addr = "someone123@example.org".to_string();
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -323,6 +323,54 @@ const DC_EVENT_FILE_COPIED: usize = 2055; // deprecated;
 const DC_EVENT_IS_OFFLINE: usize = 2081; // deprecated;
 const DC_ERROR_SEE_STRING: usize = 0; // deprecated;
 const DC_ERROR_SELF_NOT_IN_GROUP: usize = 1; // deprecated;
+const DC_STR_SELFNOTINGRP: usize = 21; // deprecated;
+
+// TODO: Strings need some doumentation about used placeholders.
+// These constants are used to set stock translation strings
+
+const DC_STR_NOMESSAGES: usize = 1;
+const DC_STR_SELF: usize = 2;
+const DC_STR_DRAFT: usize = 3;
+const DC_STR_VOICEMESSAGE: usize = 7;
+const DC_STR_DEADDROP: usize = 8;
+const DC_STR_IMAGE: usize = 9;
+const DC_STR_VIDEO: usize = 10;
+const DC_STR_AUDIO: usize = 11;
+const DC_STR_FILE: usize = 12;
+const DC_STR_STATUSLINE: usize = 13;
+const DC_STR_NEWGROUPDRAFT: usize = 14;
+const DC_STR_MSGGRPNAME: usize = 15;
+const DC_STR_MSGGRPIMGCHANGED: usize = 16;
+const DC_STR_MSGADDMEMBER: usize = 17;
+const DC_STR_MSGDELMEMBER: usize = 18;
+const DC_STR_MSGGROUPLEFT: usize = 19;
+const DC_STR_GIF: usize = 23;
+const DC_STR_ENCRYPTEDMSG: usize = 24;
+const DC_STR_E2E_AVAILABLE: usize = 25;
+const DC_STR_ENCR_TRANSP: usize = 27;
+const DC_STR_ENCR_NONE: usize = 28;
+const DC_STR_CANTDECRYPT_MSG_BODY: usize = 29;
+const DC_STR_FINGERPRINTS: usize = 30;
+const DC_STR_READRCPT: usize = 31;
+const DC_STR_READRCPT_MAILBODY: usize = 32;
+const DC_STR_MSGGRPIMGDELETED: usize = 33;
+const DC_STR_E2E_PREFERRED: usize = 34;
+const DC_STR_CONTACT_VERIFIED: usize = 35;
+const DC_STR_CONTACT_NOT_VERIFIED: usize = 36;
+const DC_STR_CONTACT_SETUP_CHANGED: usize = 37;
+const DC_STR_ARCHIVEDCHATS: usize = 40;
+const DC_STR_STARREDMSGS: usize = 41;
+const DC_STR_AC_SETUP_MSG_SUBJECT: usize = 42;
+const DC_STR_AC_SETUP_MSG_BODY: usize = 43;
+const DC_STR_CANNOT_LOGIN: usize = 60;
+const DC_STR_SERVER_RESPONSE: usize = 61;
+const DC_STR_MSGACTIONBYUSER: usize = 62;
+const DC_STR_MSGACTIONBYME: usize = 63;
+const DC_STR_MSGLOCATIONENABLED: usize = 64;
+const DC_STR_MSGLOCATIONDISABLED: usize = 65;
+const DC_STR_LOCATION: usize = 66;
+const DC_STR_STICKER: usize = 67;
+const DC_STR_COUNT: usize = 67;

 pub const DC_JOB_DELETE_MSG_ON_IMAP: i32 = 110;

--- a/src/contact.rs
+++ b/src/contact.rs
@@ -1,7 +1,5 @@
 //! Contacts module

-#![forbid(clippy::indexing_slicing)]
-
 use async_std::path::PathBuf;
 use deltachat_derive::*;
 use itertools::Itertools;
@@ -1031,10 +1029,10 @@ pub fn addr_normalize(addr: &str) -> &str {
    let norm = addr.trim();

    if norm.starts_with("mailto:") {
-        norm.get(7..).unwrap_or(norm)
-    } else {
-        norm
+        return &norm[7..];
    }
+
+    norm
 }

 fn sanitize_name_and_addr(name: impl AsRef<str>, addr: impl AsRef<str>) -> (String, String) {
@@ -1044,15 +1042,11 @@ fn sanitize_name_and_addr(name: impl AsRef<str>, addr: impl AsRef<str>) -> (Stri
    if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
        (
            if name.as_ref().is_empty() {
-                captures
-                    .get(1)
-                    .map_or("".to_string(), |m| normalize_name(m.as_str()))
+                normalize_name(&captures[1])
            } else {
                name.as_ref().to_string()
            },
-            captures
-                .get(2)
-                .map_or("".to_string(), |m| m.as_str().to_string()),
+            captures[2].to_string(),
        )
    } else {
        (name.as_ref().to_string(), addr.as_ref().to_string())
@@ -1119,21 +1113,38 @@ pub(crate) async fn set_profile_image(
 /// Normalize a name.
 ///
 /// - Remove quotes (come from some bad MUA implementations)
+/// - Convert names as "Petersen, Björn" to "Björn Petersen"
 /// - Trims the resulting string
 ///
 /// Typically, this function is not needed as it is called implicitly by `Contact::add_address_book`.
 pub fn normalize_name(full_name: impl AsRef<str>) -> String {
-    let full_name = full_name.as_ref().trim();
+    let mut full_name = full_name.as_ref().trim();
    if full_name.is_empty() {
        return full_name.into();
    }

-    match full_name.as_bytes() {
-        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => full_name
-            .get(1..full_name.len() - 1)
-            .map_or("".to_string(), |s| s.trim().into()),
-        _ => full_name.to_string(),
+    let len = full_name.len();
+    if len > 1 {
+        let firstchar = full_name.as_bytes()[0];
+        let lastchar = full_name.as_bytes()[len - 1];
+        if firstchar == b'\'' && lastchar == b'\''
+            || firstchar == b'\"' && lastchar == b'\"'
+            || firstchar == b'<' && lastchar == b'>'
+        {
+            full_name = &full_name[1..len - 1];
+        }
    }
+
+    if let Some(p1) = full_name.find(',') {
+        let (last_name, first_name) = full_name.split_at(p1);
+
+        let last_name = last_name.trim();
+        let first_name = (&first_name[1..]).trim();
+
+        return format!("{} {}", first_name, last_name);
+    }
+
+    full_name.trim().into()
 }

 fn cat_fingerprint(
@@ -1224,6 +1235,7 @@ mod tests {

    #[test]
    fn test_normalize_name() {
+        assert_eq!(&normalize_name("Doe, John"), "John Doe");
        assert_eq!(&normalize_name(" hello world   "), "hello world");
        assert_eq!(&normalize_name("<"), "<");
        assert_eq!(&normalize_name(">"), ">");
@@ -1258,7 +1270,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_contacts() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let contacts = Contact::get_all(&context.ctx, 0, Some("some2"))
            .await
            .unwrap();
@@ -1282,10 +1294,10 @@ mod tests {

    #[async_std::test]
    async fn test_is_self_addr() -> Result<()> {
-        let t = TestContext::new().await;
+        let t = test_context().await;
        assert!(t.ctx.is_self_addr("me@me.org").await.is_err());

-        let addr = t.configure_alice().await;
+        let addr = configure_alice_keypair(&t.ctx).await;
        assert_eq!(t.ctx.is_self_addr("me@me.org").await?, false);
        assert_eq!(t.ctx.is_self_addr(&addr).await?, true);

@@ -1295,7 +1307,7 @@ mod tests {
    #[async_std::test]
    async fn test_add_or_lookup() {
        // add some contacts, this also tests add_address_book()
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let book = concat!(
            "  Name one  \n one@eins.org \n",
            "Name two\ntwo@deux.net\n",
@@ -1388,10 +1400,10 @@ mod tests {
        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
        assert_eq!(sth_modified, Modifier::None);
        let contact = Contact::load_from_db(&t.ctx, contact_id).await.unwrap();
-        assert_eq!(contact.get_name(), "Wonderland, Alice");
-        assert_eq!(contact.get_display_name(), "Wonderland, Alice");
+        assert_eq!(contact.get_name(), "Alice Wonderland");
+        assert_eq!(contact.get_display_name(), "Alice Wonderland");
        assert_eq!(contact.get_addr(), "alice@w.de");
-        assert_eq!(contact.get_name_n_addr(), "Wonderland, Alice (alice@w.de)");
+        assert_eq!(contact.get_name_n_addr(), "Alice Wonderland (alice@w.de)");

        // check SELF
        let contact = Contact::load_from_db(&t.ctx, DC_CONTACT_ID_SELF)
@@ -1408,7 +1420,7 @@ mod tests {

    #[async_std::test]
    async fn test_remote_authnames() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        // incoming mail `From: bob1 <bob@example.org>` - this should init authname and name
        let (contact_id, sth_modified) = Contact::add_or_lookup(
@@ -1471,7 +1483,7 @@ mod tests {

    #[async_std::test]
    async fn test_remote_authnames_create_empty() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        // manually create "claire@example.org" without a given name
        let contact_id = Contact::create(&t.ctx, "", "claire@example.org")
@@ -1518,7 +1530,7 @@ mod tests {

    #[async_std::test]
    async fn test_remote_authnames_edit_empty() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        // manually create "dave@example.org"
        let contact_id = Contact::create(&t.ctx, "dave1", "dave@example.org")
@@ -1562,7 +1574,7 @@ mod tests {

    #[async_std::test]
    async fn test_name_in_address() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        let contact_id = Contact::create(&t.ctx, "", "<dave@example.org>")
            .await
@@ -1575,7 +1587,7 @@ mod tests {
            .await
            .unwrap();
        let contact = Contact::load_from_db(&t.ctx, contact_id).await.unwrap();
-        assert_eq!(contact.get_name(), "Mueller, Dave");
+        assert_eq!(contact.get_name(), "Dave Mueller");
        assert_eq!(contact.get_addr(), "dave@example.org");

        let contact_id = Contact::create(&t.ctx, "name1", "name2 <dave@example.org>")
--- a/src/context.rs
+++ b/src/context.rs
@@ -6,7 +6,6 @@ use std::ops::Deref;

 use async_std::path::{Path, PathBuf};
 use async_std::sync::{channel, Arc, Mutex, Receiver, RwLock, Sender};
-use async_std::task;

 use crate::chat::*;
 use crate::config::Config;
@@ -57,7 +56,6 @@ pub struct InnerContext {
    pub(crate) events: Events,

    pub(crate) scheduler: RwLock<Scheduler>,
-    pub(crate) ephemeral_task: RwLock<Option<task::JoinHandle<()>>>,

    creation_time: SystemTime,
 }
@@ -123,7 +121,6 @@ impl Context {
            translated_stockstrings: RwLock::new(HashMap::new()),
            events: Events::default(),
            scheduler: RwLock::new(Scheduler::Stopped),
-            ephemeral_task: RwLock::new(None),
            creation_time: std::time::SystemTime::now(),
        };

@@ -543,7 +540,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_fresh_msgs() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let fresh = t.ctx.get_fresh_msgs().await;
        assert!(fresh.is_empty())
    }
@@ -598,13 +595,13 @@ mod tests {

    #[async_std::test]
    async fn no_crashes_on_context_deref() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        std::mem::drop(t.ctx);
    }

    #[async_std::test]
    async fn test_get_info() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        let info = t.ctx.get_info().await;
        assert!(info.get("database_dir").is_some());
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -10,7 +10,6 @@ use crate::constants::*;
 use crate::contact::*;
 use crate::context::Context;
 use crate::dc_tools::*;
-use crate::ephemeral::{stock_ephemeral_timer_changed, Timer as EphemeralTimer};
 use crate::error::{bail, ensure, format_err, Result};
 use crate::events::Event;
 use crate::headerdef::HeaderDef;
@@ -46,14 +45,13 @@ pub async fn dc_receive_imf(
 ) -> Result<()> {
    info!(
        context,
-        "Receiving message {}/{}, seen={}...",
+        "Receiving message {}/{}...",
        if !server_folder.as_ref().is_empty() {
            server_folder.as_ref()
        } else {
            "?"
        },
        server_uid,
-        seen
    );

    if std::env::var(crate::DCC_MIME_DEBUG).unwrap_or_default() == "2" {
@@ -620,85 +618,10 @@ async fn add_parts(
            *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
        }
    }
-
-    // Extract ephemeral timer from the message.
-    let mut timer = if let Some(value) = mime_parser.get(HeaderDef::EphemeralTimer) {
-        match value.parse::<EphemeralTimer>() {
-            Ok(timer) => timer,
-            Err(err) => {
-                warn!(
-                    context,
-                    "can't parse ephemeral timer \"{}\": {}", value, err
-                );
-                EphemeralTimer::Disabled
-            }
-        }
-    } else {
-        EphemeralTimer::Disabled
-    };
-
-    let location_kml_is = mime_parser.location_kml.is_some();
-    let is_mdn = !mime_parser.mdn_reports.is_empty();
-
-    // Apply ephemeral timer changes to the chat.
-    //
-    // Only non-hidden timers are applied now. Timers from hidden
-    // messages such as read receipts can be useful to detect
-    // ephemeral timer support, but timer changes without visible
-    // received messages may be confusing to the user.
-    if !*hidden
-        && !location_kml_is
-        && !is_mdn
-        && (*chat_id).get_ephemeral_timer(context).await? != timer
-    {
-        match (*chat_id).inner_set_ephemeral_timer(context, timer).await {
-            Ok(()) => {
-                if mime_parser.is_system_message == SystemMessage::EphemeralTimerChanged {
-                    set_better_msg(
-                        mime_parser,
-                        stock_ephemeral_timer_changed(context, timer, from_id).await,
-                    );
-
-                    // Do not delete the system message itself.
-                    //
-                    // This prevents confusion when timer is changed
-                    // to 1 week, and then changed to 1 hour: after 1
-                    // hour, only the message about the change to 1
-                    // week is left.
-                    timer = EphemeralTimer::Disabled;
-                } else {
-                    chat::add_info_msg(
-                        context,
-                        *chat_id,
-                        stock_ephemeral_timer_changed(context, timer, from_id).await,
-                    )
-                    .await;
-                }
-
-                context.emit_event(Event::ChatEphemeralTimerModified {
-                    chat_id: *chat_id,
-                    timer: timer.to_u32(),
-                });
-            }
-            Err(err) => {
-                warn!(
-                    context,
-                    "failed to modify timer for chat {}: {}", chat_id, err
-                );
-            }
-        }
-    }
-
    // correct message_timestamp, it should not be used before,
    // however, we cannot do this earlier as we need from_id to be set
    let rcvd_timestamp = time();
-    let sort_timestamp = calc_sort_timestamp(
-        context,
-        *sent_timestamp,
-        *chat_id,
-        state == MessageState::InFresh,
-    )
-    .await;
+    let sort_timestamp = calc_sort_timestamp(context, *sent_timestamp, *chat_id, !seen).await;
    *sent_timestamp = std::cmp::min(*sent_timestamp, rcvd_timestamp);

    // unarchive chat
@@ -725,6 +648,7 @@ async fn add_parts(

    let mut parts = std::mem::replace(&mut mime_parser.parts, Vec::new());
    let server_folder = server_folder.as_ref().to_string();
+    let location_kml_is = mime_parser.location_kml.is_some();
    let is_system_message = mime_parser.is_system_message;
    let mime_headers = if save_mime_headers {
        Some(String::from_utf8_lossy(imf_raw).to_string())
@@ -734,6 +658,7 @@ async fn add_parts(
    let sent_timestamp = *sent_timestamp;
    let is_hidden = *hidden;
    let chat_id = *chat_id;
+    let is_mdn = !mime_parser.mdn_reports.is_empty();

    // TODO: can this clone be avoided?
    let rfc724_mid = rfc724_mid.to_string();
@@ -750,8 +675,8 @@ async fn add_parts(
                    "INSERT INTO msgs \
         (rfc724_mid, server_folder, server_uid, chat_id, from_id, to_id, timestamp, \
         timestamp_sent, timestamp_rcvd, type, state, msgrmsg,  txt, txt_raw, param, \
-         bytes, hidden, mime_headers,  mime_in_reply_to, mime_references, error, ephemeral_timer) \
-         VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?, ?,?);",
+         bytes, hidden, mime_headers,  mime_in_reply_to, mime_references, error) \
+         VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?, ?);",
                )?;

                let is_location_kml = location_kml_is
@@ -796,7 +721,6 @@ async fn add_parts(
                    mime_in_reply_to,
                    mime_references,
                    part.error,
-                    timer
                ])?;

                drop(stmt);
@@ -1862,7 +1786,7 @@ fn dc_create_incoming_rfc724_mid(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::chat::{ChatItem, ChatVisibility};
+    use crate::chat::ChatVisibility;
    use crate::chatlist::Chatlist;
    use crate::message::Message;
    use crate::test_utils::*;
@@ -1877,7 +1801,7 @@ mod tests {

    #[async_std::test]
    async fn test_grpid_simple() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = b"From: hello\n\
                    Subject: outer-subject\n\
                    In-Reply-To: <lqkjwelq123@123123>\n\
@@ -1894,7 +1818,7 @@ mod tests {

    #[async_std::test]
    async fn test_grpid_from_multiple() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = b"From: hello\n\
                    Subject: outer-subject\n\
                    In-Reply-To: <Gr.HcxyMARjyJy.9-qweqwe@asd.net>\n\
@@ -1931,7 +1855,7 @@ mod tests {

    #[async_std::test]
    async fn test_is_known_rfc724_mid() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let mut msg = Message::new(Viewtype::Text);
        msg.text = Some("first message".to_string());
        let msg_id = chat::add_device_msg(&t.ctx, None, Some(&mut msg))
@@ -1947,7 +1871,7 @@ mod tests {

    #[async_std::test]
    async fn test_is_msgrmsg_rfc724_mid() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let mut msg = Message::new(Viewtype::Text);
        msg.text = Some("first message".to_string());
        let msg_id = chat::add_device_msg(&t.ctx, None, Some(&mut msg))
@@ -1961,34 +1885,34 @@ mod tests {
        assert!(!is_msgrmsg_rfc724_mid(&t.ctx, "nonexistant@message.id").await);
    }

-    static MSGRMSG: &[u8] = b"From: Bob <bob@example.com>\n\
-                    To: alice@example.com\n\
+    static MSGRMSG: &[u8] = b"From: Bob <bob@example.org>\n\
+                    To: alice@example.org\n\
                    Chat-Version: 1.0\n\
                    Subject: Chat: hello\n\
-                    Message-ID: <Mr.1111@example.com>\n\
+                    Message-ID: <Mr.1111@example.org>\n\
                    Date: Sun, 22 Mar 2020 22:37:55 +0000\n\
                    \n\
                    hello\n";

-    static ONETOONE_NOREPLY_MAIL: &[u8] = b"From: Bob <bob@example.com>\n\
-                    To: alice@example.com\n\
+    static ONETOONE_NOREPLY_MAIL: &[u8] = b"From: Bob <bob@example.org>\n\
+                    To: alice@example.org\n\
                    Subject: Chat: hello\n\
-                    Message-ID: <2222@example.com>\n\
+                    Message-ID: <2222@example.org>\n\
                    Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
                    \n\
                    hello\n";

-    static GRP_MAIL: &[u8] = b"From: bob@example.com\n\
-                    To: alice@example.com, claire@example.com\n\
+    static GRP_MAIL: &[u8] = b"From: bob@example.org\n\
+                    To: alice@example.org, claire@example.org\n\
                    Subject: group with Alice, Bob and Claire\n\
-                    Message-ID: <3333@example.com>\n\
+                    Message-ID: <3333@example.org>\n\
                    Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
                    \n\
                    hello\n";

    #[async_std::test]
    async fn test_adhoc_group_show_chats_only() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        assert_eq!(t.ctx.get_config_int(Config::ShowEmails).await, 0);

        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
@@ -2015,7 +1939,7 @@ mod tests {

    #[async_std::test]
    async fn test_adhoc_group_show_accepted_contact_unknown() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        t.ctx
            .set_config(Config::ShowEmails, Some("1"))
            .await
@@ -2031,12 +1955,12 @@ mod tests {

    #[async_std::test]
    async fn test_adhoc_group_show_accepted_contact_known() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        t.ctx
            .set_config(Config::ShowEmails, Some("1"))
            .await
            .unwrap();
-        Contact::create(&t.ctx, "Bob", "bob@example.com")
+        Contact::create(&t.ctx, "Bob", "bob@example.org")
            .await
            .unwrap();
        dc_receive_imf(&t.ctx, GRP_MAIL, "INBOX", 1, false)
@@ -2051,7 +1975,7 @@ mod tests {

    #[async_std::test]
    async fn test_adhoc_group_show_accepted_contact_accepted() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        t.ctx
            .set_config(Config::ShowEmails, Some("1"))
            .await
@@ -2097,7 +2021,7 @@ mod tests {

    #[async_std::test]
    async fn test_adhoc_group_show_all() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        t.ctx
            .set_config(Config::ShowEmails, Some("2"))
            .await
@@ -2122,7 +2046,7 @@ mod tests {
    #[async_std::test]
    async fn test_read_receipt_and_unarchive() {
        // create alice's account
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;

        // create one-to-one with bob, archive one-to-one
        let bob_id = Contact::create(&t.ctx, "bob", "bob@exampel.org")
@@ -2165,14 +2089,14 @@ mod tests {
        dc_receive_imf(
            &t.ctx,
            format!(
-                "From: alice@example.com\n\
-                 To: bob@example.com\n\
+                "From: alice@example.org\n\
+                 To: bob@example.org\n\
                 Subject: foo\n\
-                 Message-ID: <Gr.{}.12345678901@example.com>\n\
+                 Message-ID: <Gr.{}.12345678901@example.org>\n\
                 Chat-Version: 1.0\n\
                 Chat-Group-ID: {}\n\
                 Chat-Group-Name: foo\n\
-                 Chat-Disposition-Notification-To: alice@example.com\n\
+                 Chat-Disposition-Notification-To: alice@example.org\n\
                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
                 \n\
                 hello\n",
@@ -2187,11 +2111,7 @@ mod tests {
        .unwrap();
        let msgs = chat::get_chat_msgs(&t.ctx, group_id, 0, None).await;
        assert_eq!(msgs.len(), 1);
-        let msg_id = if let ChatItem::Message { msg_id } = msgs.first().unwrap() {
-            msg_id
-        } else {
-            panic!("Wrong item type");
-        };
+        let msg_id = msgs.first().unwrap();
        let msg = message::Message::load_from_db(&t.ctx, msg_id.clone())
            .await
            .unwrap();
@@ -2205,12 +2125,12 @@ mod tests {
        dc_receive_imf(
            &t.ctx,
            format!(
-                "From: bob@example.com\n\
-                 To: alice@example.com\n\
+                "From: bob@example.org\n\
+                 To: alice@example.org\n\
                 Subject: message opened\n\
                 Date: Sun, 22 Mar 2020 23:37:57 +0000\n\
                 Chat-Version: 1.0\n\
-                 Message-ID: <Mr.12345678902@example.com>\n\
+                 Message-ID: <Mr.12345678902@example.org>\n\
                 Content-Type: multipart/report; report-type=disposition-notification; boundary=\"SNIPP\"\n\
                 \n\
                 \n\
@@ -2224,9 +2144,9 @@ mod tests {
                 Content-Type: message/disposition-notification\n\
                 \n\
                 Reporting-UA: Delta Chat 1.28.0\n\
-                 Original-Recipient: rfc822;bob@example.com\n\
-                 Final-Recipient: rfc822;bob@example.com\n\
-                 Original-Message-ID: <Gr.{}.12345678901@example.com>\n\
+                 Original-Recipient: rfc822;bob@example.org\n\
+                 Final-Recipient: rfc822;bob@example.org\n\
+                 Original-Message-ID: <Gr.{}.12345678901@example.org>\n\
                 Disposition: manual-action/MDN-sent-automatically; displayed\n\
                 \n\
                 \n\
@@ -2266,7 +2186,7 @@ mod tests {
        // are very rare, however, we have to add them to the database (they go to the
        // "deaddrop" chat) to avoid a re-download from the server. See also [**]

-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        let context = &t.ctx;

        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
@@ -2274,9 +2194,9 @@ mod tests {

        dc_receive_imf(
            context,
-            b"To: bob@example.com\n\
+            b"To: bob@example.org\n\
                 Subject: foo\n\
-                 Message-ID: <3924@example.com>\n\
+                 Message-ID: <3924@example.org>\n\
                 Chat-Version: 1.0\n\
                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
                 \n\
@@ -2295,7 +2215,7 @@ mod tests {

    #[async_std::test]
    async fn test_escaped_from() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        let contact_id = Contact::create(&t.ctx, "foobar", "foobar@example.com")
            .await
            .unwrap();
@@ -2305,9 +2225,9 @@ mod tests {
        dc_receive_imf(
            &t.ctx,
            b"From: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= <foobar@example.com>\n\
-                 To: alice@example.com\n\
+                 To: alice@example.org\n\
                 Subject: foo\n\
-                 Message-ID: <asdklfjjaweofi@example.com>\n\
+                 Message-ID: <asdklfjjaweofi@example.org>\n\
                 Chat-Version: 1.0\n\
                 Chat-Disposition-Notification-To: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= <foobar@example.com>\n\
                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
@@ -2322,15 +2242,11 @@ mod tests {
                .await
                .unwrap()
                .get_authname(),
-            "Имя, Фамилия",
+            "Фамилия Имя", // The name was "Имя, Фамилия" and ("lastname, firstname") and should be swapped to "firstname, lastname"
        );
        let msgs = chat::get_chat_msgs(&t.ctx, chat_id, 0, None).await;
        assert_eq!(msgs.len(), 1);
-        let msg_id = if let ChatItem::Message { msg_id } = msgs.first().unwrap() {
-            msg_id
-        } else {
-            panic!("Wrong item type");
-        };
+        let msg_id = msgs.first().unwrap();
        let msg = message::Message::load_from_db(&t.ctx, msg_id.clone())
            .await
            .unwrap();
@@ -2341,7 +2257,7 @@ mod tests {

    #[async_std::test]
    async fn test_escaped_recipients() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        Contact::create(&t.ctx, "foobar", "foobar@example.com")
            .await
            .unwrap();
@@ -2355,10 +2271,10 @@ mod tests {
        dc_receive_imf(
            &t.ctx,
            b"From: Foobar <foobar@example.com>\n\
-                 To: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= alice@example.com\n\
+                 To: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= alice@example.org\n\
                 Cc: =?utf-8?q?=3Ch2=3E?= <carl@host.tld>\n\
                 Subject: foo\n\
-                 Message-ID: <asdklfjjaweofi@example.com>\n\
+                 Message-ID: <asdklfjjaweofi@example.org>\n\
                 Chat-Version: 1.0\n\
                 Chat-Disposition-Notification-To: <foobar@example.com>\n\
                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
@@ -2389,7 +2305,7 @@ mod tests {

    #[async_std::test]
    async fn test_cc_to_contact() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        Contact::create(&t.ctx, "foobar", "foobar@example.com")
            .await
            .unwrap();
@@ -2407,10 +2323,10 @@ mod tests {
        dc_receive_imf(
            &t.ctx,
            b"From: Foobar <foobar@example.com>\n\
-                 To: alice@example.com\n\
+                 To: alice@example.org\n\
                 Cc: Carl <carl@host.tld>\n\
                 Subject: foo\n\
-                 Message-ID: <asdklfjjaweofi@example.com>\n\
+                 Message-ID: <asdklfjjaweofi@example.org>\n\
                 Chat-Version: 1.0\n\
                 Chat-Disposition-Notification-To: <foobar@example.com>\n\
                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
@@ -2511,8 +2427,7 @@ mod tests {
        raw_ndn: &[u8],
        error_msg: &str,
    ) {
-        let t = TestContext::new().await;
-        t.configure_addr(self_addr).await;
+        let t = configured_offline_context_with_addr(self_addr).await;

        dc_receive_imf(
            &t.ctx,
@@ -2557,19 +2472,18 @@ mod tests {

    #[async_std::test]
    async fn test_parse_ndn_group_msg() {
-        let t = TestContext::new().await;
-        t.configure_addr("alice@gmail.com").await;
+        let t = configured_offline_context_with_addr("alice@gmail.com").await;

        dc_receive_imf(
            &t.ctx,
            b"From: alice@gmail.com\n\
-                 To: bob@example.com, assidhfaaspocwaeofi@gmail.com\n\
+                 To: bob@example.org, assidhfaaspocwaeofi@gmail.com\n\
                 Subject: foo\n\
                 Message-ID: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>\n\
                 Chat-Version: 1.0\n\
                 Chat-Group-ID: abcde\n\
                 Chat-Group-Name: foo\n\
-                 Chat-Disposition-Notification-To: alice@example.com\n\
+                 Chat-Disposition-Notification-To: alice@example.org\n\
                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
                 \n\
                 hello\n",
@@ -2593,12 +2507,9 @@ mod tests {
        assert_eq!(msg.state, MessageState::OutFailed);

        let msgs = chat::get_chat_msgs(&t.ctx, msg.chat_id, 0, None).await;
-        let msg_id = if let ChatItem::Message { msg_id } = msgs.last().unwrap() {
-            msg_id
-        } else {
-            panic!("Wrong item type");
-        };
-        let last_msg = Message::load_from_db(&t.ctx, *msg_id).await.unwrap();
+        let last_msg = Message::load_from_db(&t.ctx, *msgs.last().unwrap())
+            .await
+            .unwrap();

        assert_eq!(
            last_msg.text,
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -774,7 +774,7 @@ mod tests {

    #[async_std::test]
    async fn test_file_handling() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let context = &t.ctx;
        macro_rules! dc_file_exist {
            ($ctx:expr, $fname:expr) => {
@@ -853,7 +853,7 @@ mod tests {

    #[async_std::test]
    async fn test_create_smeared_timestamp() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        assert_ne!(
            dc_create_smeared_timestamp(&t.ctx).await,
            dc_create_smeared_timestamp(&t.ctx).await
@@ -869,7 +869,7 @@ mod tests {

    #[async_std::test]
    async fn test_create_smeared_timestamps() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let count = MAX_SECONDS_TO_LEND_FROM_FUTURE - 1;
        let start = dc_create_smeared_timestamps(&t.ctx, count as usize).await;
        let next = dc_smeared_time(&t.ctx).await;
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -327,14 +327,14 @@ mod tests {

        #[async_std::test]
        async fn test_prexisting() {
-            let t = TestContext::new().await;
-            let test_addr = t.configure_alice().await;
+            let t = dummy_context().await;
+            let test_addr = configure_alice_keypair(&t.ctx).await;
            assert_eq!(ensure_secret_key_exists(&t.ctx).await.unwrap(), test_addr);
        }

        #[async_std::test]
        async fn test_not_configured() {
-            let t = TestContext::new().await;
+            let t = dummy_context().await;
            assert!(ensure_secret_key_exists(&t.ctx).await.is_err());
        }
    }
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -1,523 +0,0 @@
-//! # Ephemeral messages
-//!
-//! Ephemeral messages are messages that have an Ephemeral-Timer
-//! header attached to them, which specifies time in seconds after
-//! which the message should be deleted both from the device and from
-//! the server. The timer is started when the message is marked as
-//! seen, which usually happens when its contents is displayed on
-//! device screen.
-//!
-//! Each chat, including 1:1, group chats and "saved messages" chat,
-//! has its own ephemeral timer setting, which is applied to all
-//! messages sent to the chat. The setting is synchronized to all the
-//! devices participating in the chat by applying the timer value from
-//! all received messages, including BCC-self ones, to the chat. This
-//! way the setting is eventually synchronized among all participants.
-//!
-//! When user changes ephemeral timer setting for the chat, a system
-//! message is automatically sent to update the setting for all
-//! participants. This allows changing the setting for a chat like any
-//! group chat setting, e.g. name and avatar, without the need to
-//! write an actual message.
-//!
-//! ## Device settings
-//!
-//! In addition to per-chat ephemeral message setting, each device has
-//! two global user-configured settings that complement per-chat
-//! settings: `delete_device_after` and `delete_server_after`. These
-//! settings are not synchronized among devices and apply to all
-//! messages known to the device, including messages sent or received
-//! before configuring the setting.
-//!
-//! `delete_device_after` configures the maximum time device is
-//! storing the messages locally. `delete_server_after` configures the
-//! time after which device will delete the messages it knows about
-//! from the server.
-//!
-//! ## How messages are deleted
-//!
-//! When the message is deleted locally, its contents is removed and
-//! it is moved to the trash chat. This database entry is then used to
-//! track the Message-ID and corresponding IMAP folder and UID until
-//! the message is deleted from the server. Vice versa, when device
-//! deletes the message from the server, it removes IMAP folder and
-//! UID information, but keeps the message contents. When database
-//! entry is both moved to trash chat and does not contain UID
-//! information, it is deleted from the database, leaving no trace of
-//! the message.
-//!
-//! ## When messages are deleted
-//!
-//! Local deletion happens when the chatlist or chat is loaded. A
-//! `MsgsChanged` event is emitted when a message deletion is due, to
-//! make UI reload displayed messages and cause actual deletion.
-//!
-//! Server deletion happens by generating IMAP deletion jobs based on
-//! the database entries which are expired either according to their
-//! ephemeral message timers or global `delete_server_after` setting.
-
-use crate::chat::{lookup_by_contact_id, send_msg, ChatId};
-use crate::constants::{
-    Viewtype, DC_CHAT_ID_LAST_SPECIAL, DC_CHAT_ID_TRASH, DC_CONTACT_ID_DEVICE, DC_CONTACT_ID_SELF,
-};
-use crate::context::Context;
-use crate::dc_tools::time;
-use crate::error::{ensure, Error};
-use crate::events::Event;
-use crate::message::{Message, MessageState, MsgId};
-use crate::mimeparser::SystemMessage;
-use crate::sql;
-use crate::stock::StockMessage;
-use async_std::task;
-use serde::{Deserialize, Serialize};
-use std::convert::{TryFrom, TryInto};
-use std::num::ParseIntError;
-use std::str::FromStr;
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-#[derive(Debug, PartialEq, Eq, Copy, Clone, Serialize, Deserialize)]
-pub enum Timer {
-    Disabled,
-    Enabled { duration: u32 },
-}
-
-impl Timer {
-    pub fn to_u32(self) -> u32 {
-        match self {
-            Self::Disabled => 0,
-            Self::Enabled { duration } => duration,
-        }
-    }
-
-    pub fn from_u32(duration: u32) -> Self {
-        if duration == 0 {
-            Self::Disabled
-        } else {
-            Self::Enabled { duration }
-        }
-    }
-}
-
-impl Default for Timer {
-    fn default() -> Self {
-        Self::Disabled
-    }
-}
-
-impl ToString for Timer {
-    fn to_string(&self) -> String {
-        self.to_u32().to_string()
-    }
-}
-
-impl FromStr for Timer {
-    type Err = ParseIntError;
-
-    fn from_str(input: &str) -> Result<Timer, ParseIntError> {
-        input.parse::<u32>().map(Self::from_u32)
-    }
-}
-
-impl rusqlite::types::ToSql for Timer {
-    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput> {
-        let val = rusqlite::types::Value::Integer(match self {
-            Self::Disabled => 0,
-            Self::Enabled { duration } => i64::from(*duration),
-        });
-        let out = rusqlite::types::ToSqlOutput::Owned(val);
-        Ok(out)
-    }
-}
-
-impl rusqlite::types::FromSql for Timer {
-    fn column_result(value: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
-        i64::column_result(value).and_then(|value| {
-            if value == 0 {
-                Ok(Self::Disabled)
-            } else if let Ok(duration) = u32::try_from(value) {
-                Ok(Self::Enabled { duration })
-            } else {
-                Err(rusqlite::types::FromSqlError::OutOfRange(value))
-            }
-        })
-    }
-}
-
-impl ChatId {
-    /// Get ephemeral message timer value in seconds.
-    pub async fn get_ephemeral_timer(self, context: &Context) -> Result<Timer, Error> {
-        let timer = context
-            .sql
-            .query_get_value_result(
-                "SELECT ephemeral_timer FROM chats WHERE id=?;",
-                paramsv![self],
-            )
-            .await?;
-        Ok(timer.unwrap_or_default())
-    }
-
-    /// Set ephemeral timer value without sending a message.
-    ///
-    /// Used when a message arrives indicating that someone else has
-    /// changed the timer value for a chat.
-    pub(crate) async fn inner_set_ephemeral_timer(
-        self,
-        context: &Context,
-        timer: Timer,
-    ) -> Result<(), Error> {
-        ensure!(!self.is_special(), "Invalid chat ID");
-
-        context
-            .sql
-            .execute(
-                "UPDATE chats
-             SET ephemeral_timer=?
-             WHERE id=?;",
-                paramsv![timer, self],
-            )
-            .await?;
-        Ok(())
-    }
-
-    /// Set ephemeral message timer value in seconds.
-    ///
-    /// If timer value is 0, disable ephemeral message timer.
-    pub async fn set_ephemeral_timer(self, context: &Context, timer: Timer) -> Result<(), Error> {
-        if timer == self.get_ephemeral_timer(context).await? {
-            return Ok(());
-        }
-        self.inner_set_ephemeral_timer(context, timer).await?;
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some(stock_ephemeral_timer_changed(context, timer, DC_CONTACT_ID_SELF).await);
-        msg.param.set_cmd(SystemMessage::EphemeralTimerChanged);
-        if let Err(err) = send_msg(context, self, &mut msg).await {
-            error!(
-                context,
-                "Failed to send a message about ephemeral message timer change: {:?}", err
-            );
-        }
-        Ok(())
-    }
-}
-
-/// Returns a stock message saying that ephemeral timer is changed to `timer` by `from_id`.
-pub(crate) async fn stock_ephemeral_timer_changed(
-    context: &Context,
-    timer: Timer,
-    from_id: u32,
-) -> String {
-    let stock_message = match timer {
-        Timer::Disabled => StockMessage::MsgEphemeralTimerDisabled,
-        Timer::Enabled { duration } => match duration {
-            60 => StockMessage::MsgEphemeralTimerMinute,
-            3600 => StockMessage::MsgEphemeralTimerHour,
-            86400 => StockMessage::MsgEphemeralTimerDay,
-            604_800 => StockMessage::MsgEphemeralTimerWeek,
-            2_419_200 => StockMessage::MsgEphemeralTimerFourWeeks,
-            _ => StockMessage::MsgEphemeralTimerEnabled,
-        },
-    };
-
-    context
-        .stock_system_msg(stock_message, timer.to_string(), "", from_id)
-        .await
-}
-
-impl MsgId {
-    /// Returns ephemeral message timer value for the message.
-    pub(crate) async fn ephemeral_timer(self, context: &Context) -> crate::sql::Result<Timer> {
-        let res = match context
-            .sql
-            .query_get_value_result(
-                "SELECT ephemeral_timer FROM msgs WHERE id=?",
-                paramsv![self],
-            )
-            .await?
-        {
-            None | Some(0) => Timer::Disabled,
-            Some(duration) => Timer::Enabled { duration },
-        };
-        Ok(res)
-    }
-
-    /// Starts ephemeral message timer for the message if it is not started yet.
-    pub(crate) async fn start_ephemeral_timer(self, context: &Context) -> crate::sql::Result<()> {
-        if let Timer::Enabled { duration } = self.ephemeral_timer(context).await? {
-            let ephemeral_timestamp = time() + i64::from(duration);
-
-            context
-                .sql
-                .execute(
-                    "UPDATE msgs SET ephemeral_timestamp = ? \
-                WHERE (ephemeral_timestamp == 0 OR ephemeral_timestamp > ?) \
-                AND id = ?",
-                    paramsv![ephemeral_timestamp, ephemeral_timestamp, self],
-                )
-                .await?;
-            schedule_ephemeral_task(context).await;
-        }
-        Ok(())
-    }
-}
-
-/// Deletes messages which are expired according to
-/// `delete_device_after` setting or `ephemeral_timestamp` column.
-///
-/// Returns true if any message is deleted, so caller can emit
-/// MsgsChanged event. If nothing has been deleted, returns
-/// false. This function does not emit the MsgsChanged event itself,
-/// because it is also called when chatlist is reloaded, and emitting
-/// MsgsChanged there will cause infinite reload loop.
-pub(crate) async fn delete_expired_messages(context: &Context) -> Result<bool, Error> {
-    let mut updated = context
-        .sql
-        .execute(
-            "UPDATE msgs \
-             SET txt = 'DELETED', chat_id = ? \
-             WHERE \
-             ephemeral_timestamp != 0 \
-             AND ephemeral_timestamp < ? \
-             AND chat_id != ?",
-            paramsv![DC_CHAT_ID_TRASH, time(), DC_CHAT_ID_TRASH],
-        )
-        .await?
-        > 0;
-
-    if let Some(delete_device_after) = context.get_config_delete_device_after().await {
-        let self_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_SELF)
-            .await
-            .unwrap_or_default()
-            .0;
-        let device_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE)
-            .await
-            .unwrap_or_default()
-            .0;
-
-        let threshold_timestamp = time() - delete_device_after;
-
-        // Delete expired messages
-        //
-        // Only update the rows that have to be updated, to avoid emitting
-        // unnecessary "chat modified" events.
-        let rows_modified = context
-            .sql
-            .execute(
-                "UPDATE msgs \
-             SET txt = 'DELETED', chat_id = ? \
-             WHERE timestamp < ? \
-             AND chat_id > ? \
-             AND chat_id != ? \
-             AND chat_id != ?",
-                paramsv![
-                    DC_CHAT_ID_TRASH,
-                    threshold_timestamp,
-                    DC_CHAT_ID_LAST_SPECIAL,
-                    self_chat_id,
-                    device_chat_id
-                ],
-            )
-            .await?;
-
-        updated |= rows_modified > 0;
-    }
-
-    schedule_ephemeral_task(context).await;
-    Ok(updated)
-}
-
-/// Schedule a task to emit MsgsChanged event when the next local
-/// deletion happens. Existing task is cancelled to make sure at most
-/// one such task is scheduled at a time.
-///
-/// UI is expected to reload the chatlist or the chat in response to
-/// MsgsChanged event, this will trigger actual deletion.
-///
-/// This takes into account only per-chat timeouts, because global device
-/// timeouts are at least one hour long and deletion is triggered often enough
-/// by user actions.
-pub async fn schedule_ephemeral_task(context: &Context) {
-    let ephemeral_timestamp: Option<i64> = match context
-        .sql
-        .query_get_value_result(
-            "SELECT ephemeral_timestamp \
-         FROM msgs \
-         WHERE ephemeral_timestamp != 0 \
-           AND chat_id != ? \
-         ORDER BY ephemeral_timestamp ASC \
-         LIMIT 1",
-            paramsv![DC_CHAT_ID_TRASH], // Trash contains already deleted messages, skip them
-        )
-        .await
-    {
-        Err(err) => {
-            warn!(context, "Can't calculate next ephemeral timeout: {}", err);
-            return;
-        }
-        Ok(ephemeral_timestamp) => ephemeral_timestamp,
-    };
-
-    // Cancel existing task, if any
-    if let Some(ephemeral_task) = context.ephemeral_task.write().await.take() {
-        ephemeral_task.cancel().await;
-    }
-
-    if let Some(ephemeral_timestamp) = ephemeral_timestamp {
-        let now = SystemTime::now();
-        let until = UNIX_EPOCH
-            + Duration::from_secs(ephemeral_timestamp.try_into().unwrap_or(u64::MAX))
-            + Duration::from_secs(1);
-
-        if let Ok(duration) = until.duration_since(now) {
-            // Schedule a task, ephemeral_timestamp is in the future
-            let context1 = context.clone();
-            let ephemeral_task = task::spawn(async move {
-                async_std::task::sleep(duration).await;
-                emit_event!(
-                    context1,
-                    Event::MsgsChanged {
-                        chat_id: ChatId::new(0),
-                        msg_id: MsgId::new(0)
-                    }
-                );
-            });
-            *context.ephemeral_task.write().await = Some(ephemeral_task);
-        } else {
-            // Emit event immediately
-            emit_event!(
-                context,
-                Event::MsgsChanged {
-                    chat_id: ChatId::new(0),
-                    msg_id: MsgId::new(0)
-                }
-            );
-        }
-    }
-}
-
-/// Returns ID of any expired message that should be deleted from the server.
-///
-/// It looks up the trash chat too, to find messages that are already
-/// deleted locally, but not deleted on the server.
-pub(crate) async fn load_imap_deletion_msgid(context: &Context) -> sql::Result<Option<MsgId>> {
-    let now = time();
-
-    let threshold_timestamp = match context.get_config_delete_server_after().await {
-        None => 0,
-        Some(delete_server_after) => now - delete_server_after,
-    };
-
-    context
-        .sql
-        .query_row_optional(
-            "SELECT id FROM msgs \
-         WHERE ( \
-         timestamp < ? \
-         OR (ephemeral_timestamp != 0 AND ephemeral_timestamp < ?) \
-         ) \
-         AND server_uid != 0 \
-         LIMIT 1",
-            paramsv![threshold_timestamp, now],
-            |row| row.get::<_, MsgId>(0),
-        )
-        .await
-}
-
-/// Start ephemeral timers for seen messages if they are not started
-/// yet.
-///
-/// It is possible that timers are not started due to a missing or
-/// failed `MsgId.start_ephemeral_timer()` call, either in the current
-/// or previous version of Delta Chat.
-///
-/// This function is supposed to be called in the background,
-/// e.g. from housekeeping task.
-pub(crate) async fn start_ephemeral_timers(context: &Context) -> sql::Result<()> {
-    context
-        .sql
-        .execute(
-            "UPDATE msgs \
-    SET ephemeral_timestamp = ? + ephemeral_timer \
-    WHERE ephemeral_timer > 0 \
-    AND ephemeral_timestamp = 0 \
-    AND state NOT IN (?, ?, ?)",
-            paramsv![
-                time(),
-                MessageState::InFresh,
-                MessageState::InNoticed,
-                MessageState::OutDraft
-            ],
-        )
-        .await?;
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::*;
-
-    #[async_std::test]
-    async fn test_stock_ephemeral_messages() {
-        let context = TestContext::new().await.ctx;
-
-        assert_eq!(
-            stock_ephemeral_timer_changed(&context, Timer::Disabled, DC_CONTACT_ID_SELF).await,
-            "Message deletion timer is disabled by me."
-        );
-
-        assert_eq!(
-            stock_ephemeral_timer_changed(&context, Timer::Disabled, 0).await,
-            "Message deletion timer is disabled."
-        );
-        assert_eq!(
-            stock_ephemeral_timer_changed(&context, Timer::Enabled { duration: 1 }, 0).await,
-            "Message deletion timer is set to 1 s."
-        );
-        assert_eq!(
-            stock_ephemeral_timer_changed(&context, Timer::Enabled { duration: 30 }, 0).await,
-            "Message deletion timer is set to 30 s."
-        );
-        assert_eq!(
-            stock_ephemeral_timer_changed(&context, Timer::Enabled { duration: 60 }, 0).await,
-            "Message deletion timer is set to 1 minute."
-        );
-        assert_eq!(
-            stock_ephemeral_timer_changed(&context, Timer::Enabled { duration: 60 * 60 }, 0).await,
-            "Message deletion timer is set to 1 hour."
-        );
-        assert_eq!(
-            stock_ephemeral_timer_changed(
-                &context,
-                Timer::Enabled {
-                    duration: 24 * 60 * 60
-                },
-                0
-            )
-            .await,
-            "Message deletion timer is set to 1 day."
-        );
-        assert_eq!(
-            stock_ephemeral_timer_changed(
-                &context,
-                Timer::Enabled {
-                    duration: 7 * 24 * 60 * 60
-                },
-                0
-            )
-            .await,
-            "Message deletion timer is set to 1 week."
-        );
-        assert_eq!(
-            stock_ephemeral_timer_changed(
-                &context,
-                Timer::Enabled {
-                    duration: 4 * 7 * 24 * 60 * 60
-                },
-                0
-            )
-            .await,
-            "Message deletion timer is set to 4 weeks."
-        );
-    }
-}
--- a/src/events.rs
+++ b/src/events.rs
@@ -189,16 +189,9 @@ pub enum Event {
    /// Or the verify state of a chat has changed.
    /// See dc_set_chat_name(), dc_set_chat_profile_image(), dc_add_contact_to_chat()
    /// and dc_remove_contact_from_chat().
-    ///
-    /// This event does not include ephemeral timer modification, which
-    /// is a separate event.
    #[strum(props(id = "2020"))]
    ChatModified(ChatId),

-    /// Chat ephemeral timer changed.
-    #[strum(props(id = "2021"))]
-    ChatEphemeralTimerModified { chat_id: ChatId, timer: u32 },
-
    /// Contact(s) created, renamed, blocked or deleted.
    ///
    /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -42,7 +42,6 @@ pub enum HeaderDef {
    SecureJoinFingerprint,
    SecureJoinInvitenumber,
    SecureJoinAuth,
-    EphemeralTimer,
    _TestHeader,
 }

--- a/src/imap/idle.rs
+++ b/src/imap/idle.rs
@@ -13,19 +13,19 @@ type Result<T> = std::result::Result<T, Error>;

 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("IMAP IDLE protocol failed to init/complete: {0}")]
+    #[error("IMAP IDLE protocol failed to init/complete")]
    IdleProtocolFailed(#[from] async_imap::error::Error),

-    #[error("IMAP IDLE protocol timed out: {0}")]
+    #[error("IMAP IDLE protocol timed out")]
    IdleTimeout(#[from] async_std::future::TimeoutError),

    #[error("IMAP server does not have IDLE capability")]
    IdleAbilityMissing,

-    #[error("IMAP select folder error: {0}")]
+    #[error("IMAP select folder error")]
    SelectFolderError(#[from] select_folder::Error),

-    #[error("Setup handle error: {0}")]
+    #[error("Setup handle error")]
    SetupHandleError(#[from] super::Error),
 }

@@ -48,10 +48,11 @@ impl Imap {

        self.select_folder(context, watch_folder.clone()).await?;

+        let session = self.session.take();
        let timeout = Duration::from_secs(23 * 60);
        let mut info = Default::default();

-        if let Some(session) = self.session.take() {
+        if let Some(session) = session {
            let mut handle = session.idle();
            if let Err(err) = handle.init().await {
                return Err(Error::IdleProtocolFailed(err));
@@ -64,43 +65,68 @@ impl Imap {
                Interrupt(InterruptInfo),
            }

-            info!(context, "Idle entering wait-on-remote state");
-            let fut = idle_wait.map(|ev| ev.map(Event::IdleResponse)).race(async {
-                let probe_network = self.idle_interrupt.recv().await;
-
-                // cancel imap idle connection properly
+            if self.skip_next_idle_wait {
+                // interrupt_idle has happened before we
+                // provided self.interrupt
+                self.skip_next_idle_wait = false;
+                drop(idle_wait);
                drop(interrupt);

-                Ok(Event::Interrupt(probe_network.unwrap_or_default()))
-            });
+                info!(context, "Idle wait was skipped");
+            } else {
+                info!(context, "Idle entering wait-on-remote state");
+                let fut = idle_wait.map(|ev| ev.map(Event::IdleResponse)).race(
+                    self.idle_interrupt.recv().map(|probe_network| {
+                        Ok(Event::Interrupt(probe_network.unwrap_or_default()))
+                    }),
+                );

-            match fut.await {
-                Ok(Event::IdleResponse(IdleResponse::NewData(_))) => {
-                    info!(context, "Idle has NewData");
-                }
-                Ok(Event::IdleResponse(IdleResponse::Timeout)) => {
-                    info!(context, "Idle-wait timeout or interruption");
-                }
-                Ok(Event::IdleResponse(IdleResponse::ManualInterrupt)) => {
-                    info!(context, "Idle wait was interrupted");
-                }
-                Ok(Event::Interrupt(i)) => {
-                    info = i;
-                    info!(context, "Idle wait was interrupted");
-                }
-                Err(err) => {
-                    warn!(context, "Idle wait errored: {:?}", err);
+                match fut.await {
+                    Ok(Event::IdleResponse(IdleResponse::NewData(_))) => {
+                        info!(context, "Idle has NewData");
+                    }
+                    // TODO: idle_wait does not distinguish manual interrupts
+                    // from Timeouts if we would know it's a Timeout we could bail
+                    // directly and reconnect .
+                    Ok(Event::IdleResponse(IdleResponse::Timeout)) => {
+                        info!(context, "Idle-wait timeout or interruption");
+                    }
+                    Ok(Event::IdleResponse(IdleResponse::ManualInterrupt)) => {
+                        info!(context, "Idle wait was interrupted");
+                    }
+                    Ok(Event::Interrupt(i)) => {
+                        info = i;
+                        info!(context, "Idle wait was interrupted");
+                    }
+                    Err(err) => {
+                        warn!(context, "Idle wait errored: {:?}", err);
+                    }
                }
            }

-            let session = handle
+            // if we can't properly terminate the idle
+            // protocol let's break the connection.
+            let res = handle
                .done()
                .timeout(Duration::from_secs(15))
                .await
-                .map_err(Error::IdleTimeout)??;
-            self.session = Some(Session { inner: session });
-        } else {
-            warn!(context, "Attempted to idle without a session");
+                .map_err(|err| {
+                    self.trigger_reconnect();
+                    Error::IdleTimeout(err)
+                })?;
+
+            match res {
+                Ok(session) => {
+                    self.session = Some(Session { inner: session });
+                }
+                Err(err) => {
+                    // if we cannot terminate IDLE it probably
+                    // means that we waited long (with idle_wait)
+                    // but the network went away/changed
+                    self.trigger_reconnect();
+                    return Err(Error::IdleProtocolFailed(err));
+                }
+            }
        }

        Ok(info)
@@ -122,66 +148,73 @@ impl Imap {
            return self.idle_interrupt.recv().await.unwrap_or_default();
        }

-        // check every minute if there are new messages
-        // TODO: grow sleep durations / make them more flexible
-        let mut interval = async_std::stream::interval(Duration::from_secs(60));
+        let mut info: InterruptInfo = Default::default();
+        if self.skip_next_idle_wait {
+            // interrupt_idle has happened before we
+            // provided self.interrupt
+            self.skip_next_idle_wait = false;
+            info!(context, "fake-idle wait was skipped");
+        } else {
+            // check every minute if there are new messages
+            // TODO: grow sleep durations / make them more flexible
+            let mut interval = async_std::stream::interval(Duration::from_secs(60));

-        enum Event {
-            Tick,
-            Interrupt(InterruptInfo),
-        }
-        // loop until we are interrupted or if we fetched something
-        let info = loop {
-            use futures::future::FutureExt;
-            match interval
-                .next()
-                .map(|_| Event::Tick)
-                .race(
-                    self.idle_interrupt
-                        .recv()
-                        .map(|probe_network| Event::Interrupt(probe_network.unwrap_or_default())),
-                )
-                .await
-            {
-                Event::Tick => {
-                    // try to connect with proper login params
-                    // (setup_handle_if_needed might not know about them if we
-                    // never successfully connected)
-                    if let Err(err) = self.connect_configured(context).await {
-                        warn!(context, "fake_idle: could not connect: {}", err);
-                        continue;
-                    }
-                    if self.config.can_idle {
-                        // we only fake-idled because network was gone during IDLE, probably
-                        break InterruptInfo::new(false, None);
-                    }
-                    info!(context, "fake_idle is connected");
-                    // we are connected, let's see if fetching messages results
-                    // in anything.  If so, we behave as if IDLE had data but
-                    // will have already fetched the messages so perform_*_fetch
-                    // will not find any new.
+            enum Event {
+                Tick,
+                Interrupt(InterruptInfo),
+            }
+            // loop until we are interrupted or if we fetched something
+            info =
+                loop {
+                    use futures::future::FutureExt;
+                    match interval
+                        .next()
+                        .map(|_| Event::Tick)
+                        .race(self.idle_interrupt.recv().map(|probe_network| {
+                            Event::Interrupt(probe_network.unwrap_or_default())
+                        }))
+                        .await
+                    {
+                        Event::Tick => {
+                            // try to connect with proper login params
+                            // (setup_handle_if_needed might not know about them if we
+                            // never successfully connected)
+                            if let Err(err) = self.connect_configured(context).await {
+                                warn!(context, "fake_idle: could not connect: {}", err);
+                                continue;
+                            }
+                            if self.config.can_idle {
+                                // we only fake-idled because network was gone during IDLE, probably
+                                break InterruptInfo::new(false, None);
+                            }
+                            info!(context, "fake_idle is connected");
+                            // we are connected, let's see if fetching messages results
+                            // in anything.  If so, we behave as if IDLE had data but
+                            // will have already fetched the messages so perform_*_fetch
+                            // will not find any new.

-                    if let Some(ref watch_folder) = watch_folder {
-                        match self.fetch_new_messages(context, watch_folder).await {
-                            Ok(res) => {
-                                info!(context, "fetch_new_messages returned {:?}", res);
-                                if res {
-                                    break InterruptInfo::new(false, None);
+                            if let Some(ref watch_folder) = watch_folder {
+                                match self.fetch_new_messages(context, watch_folder).await {
+                                    Ok(res) => {
+                                        info!(context, "fetch_new_messages returned {:?}", res);
+                                        if res {
+                                            break InterruptInfo::new(false, None);
+                                        }
+                                    }
+                                    Err(err) => {
+                                        error!(context, "could not fetch from folder: {}", err);
+                                        self.trigger_reconnect()
+                                    }
                                }
                            }
-                            Err(err) => {
-                                error!(context, "could not fetch from folder: {}", err);
-                                self.trigger_reconnect()
-                            }
+                        }
+                        Event::Interrupt(info) => {
+                            // Interrupt
+                            break info;
                        }
                    }
-                }
-                Event::Interrupt(info) => {
-                    // Interrupt
-                    break info;
-                }
-            }
-        };
+                };
+        }

        info!(
            context,
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -3,8 +3,6 @@
 //! uses [async-email/async-imap](https://github.com/async-email/async-imap)
 //! to implement connect, fetch, delete functionality with standard IMAP servers.

-#![forbid(clippy::indexing_slicing)]
-
 use std::collections::BTreeMap;

 use async_imap::{
@@ -117,6 +115,7 @@ pub struct Imap {
    session: Option<Session>,
    connected: bool,
    interrupt: Option<stop_token::StopSource>,
+    skip_next_idle_wait: bool,
    should_reconnect: bool,
 }

@@ -190,6 +189,7 @@ impl Imap {
            session: Default::default(),
            connected: Default::default(),
            interrupt: Default::default(),
+            skip_next_idle_wait: Default::default(),
            should_reconnect: Default::default(),
        }
    }
@@ -732,17 +732,9 @@ impl Imap {
        folder: S,
        server_uids: &[u32],
    ) -> (Option<u32>, usize) {
-        let set = match server_uids {
-            [] => return (None, 0),
-            [server_uid] => server_uid.to_string(),
-            [first_uid, .., last_uid] => {
-                // XXX: it is assumed that UIDs are sorted and
-                // contiguous. If UIDs are not contiguous, more
-                // messages than needed will be downloaded.
-                debug_assert!(first_uid < last_uid, "uids must be sorted");
-                format!("{}:{}", first_uid, last_uid)
-            }
-        };
+        if server_uids.is_empty() {
+            return (None, 0);
+        }

        if !self.is_connected() {
            warn!(context, "Not connected");
@@ -758,6 +750,15 @@ impl Imap {

        let session = self.session.as_mut().unwrap();

+        let set = if server_uids.len() == 1 {
+            server_uids[0].to_string()
+        } else {
+            let first_uid = server_uids[0];
+            let last_uid = server_uids[server_uids.len() - 1];
+            assert!(first_uid < last_uid, "uids must be sorted");
+            format!("{}:{}", first_uid, last_uid)
+        };
+
        let mut msgs = match session.uid_fetch(&set, BODY_FLAGS).await {
            Ok(msgs) => msgs,
            Err(err) => {
@@ -781,6 +782,7 @@ impl Imap {
        let mut last_uid = None;
        let mut count = 0;

+        let mut tasks = Vec::with_capacity(server_uids.len());
        while let Some(Ok(msg)) = msgs.next().await {
            let server_uid = msg.uid.unwrap_or_default();

@@ -800,17 +802,32 @@ impl Imap {
            let context = context.clone();
            let folder = folder.clone();

-            // safe, as we checked above that there is a body.
-            let body = msg.body().unwrap();
-            let is_seen = msg.flags().any(|flag| flag == Flag::Seen);
+            let task = async_std::task::spawn(async move {
+                // safe, as we checked above that there is a body.
+                let body = msg.body().unwrap();
+                let is_seen = msg.flags().any(|flag| flag == Flag::Seen);

-            match dc_receive_imf(&context, &body, &folder, server_uid, is_seen).await {
-                Ok(_) => last_uid = Some(server_uid),
-                Err(err) => {
-                    warn!(context, "dc_receive_imf error: {}", err);
+                match dc_receive_imf(&context, &body, &folder, server_uid, is_seen).await {
+                    Ok(_) => Some(server_uid),
+                    Err(err) => {
+                        warn!(context, "dc_receive_imf error: {}", err);
+                        read_errors += 1;
+                        None
+                    }
+                }
+            });
+            tasks.push(task);
+        }
+
+        for task in futures::future::join_all(tasks).await {
+            match task {
+                Some(uid) => {
+                    last_uid = Some(uid);
+                }
+                None => {
                    read_errors += 1;
                }
-            };
+            }
        }

        if count != server_uids.len() {
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -776,9 +776,9 @@ mod tests {

    #[async_std::test]
    async fn test_render_setup_file() {
-        let t = TestContext::new().await;
+        let t = test_context().await;

-        t.configure_alice().await;
+        configure_alice_keypair(&t.ctx).await;
        let msg = render_setup_file(&t.ctx, "hello").await.unwrap();
        println!("{}", &msg);
        // Check some substrings, indicating things got substituted.
@@ -795,12 +795,12 @@ mod tests {

    #[async_std::test]
    async fn test_render_setup_file_newline_replace() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx
            .set_stock_translation(StockMessage::AcSetupMsgBody, "hello\r\nthere".to_string())
            .await
            .unwrap();
-        t.configure_alice().await;
+        configure_alice_keypair(&t.ctx).await;
        let msg = render_setup_file(&t.ctx, "pw").await.unwrap();
        println!("{}", &msg);
        assert!(msg.contains("<p>hello<br>there</p>"));
@@ -808,7 +808,7 @@ mod tests {

    #[async_std::test]
    async fn test_create_setup_code() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let setupcode = create_setup_code(&t.ctx);
        assert_eq!(setupcode.len(), 44);
        assert_eq!(setupcode.chars().nth(4).unwrap(), '-');
@@ -823,7 +823,7 @@ mod tests {

    #[async_std::test]
    async fn test_export_key_to_asc_file() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let key = alice_keypair().public;
        let blobdir = "$BLOBDIR";
        assert!(export_key_to_asc_file(&context.ctx, blobdir, None, &key)
--- a/src/job.rs
+++ b/src/job.rs
@@ -21,7 +21,6 @@ use crate::constants::*;
 use crate::contact::Contact;
 use crate::context::Context;
 use crate::dc_tools::*;
-use crate::ephemeral::load_imap_deletion_msgid;
 use crate::error::{bail, ensure, format_err, Error, Result};
 use crate::events::Event;
 use crate::imap::*;
@@ -829,6 +828,25 @@ pub(crate) enum Connection<'a> {
    Smtp(&'a mut Smtp),
 }

+async fn load_imap_deletion_msgid(context: &Context) -> sql::Result<Option<MsgId>> {
+    if let Some(delete_server_after) = context.get_config_delete_server_after().await {
+        let threshold_timestamp = time() - delete_server_after;
+
+        context
+            .sql
+            .query_row_optional(
+                "SELECT id FROM msgs \
+             WHERE timestamp < ? \
+             AND server_uid != 0",
+                paramsv![threshold_timestamp],
+                |row| row.get::<_, MsgId>(0),
+            )
+            .await
+    } else {
+        Ok(None)
+    }
+}
+
 async fn load_imap_deletion_job(context: &Context) -> sql::Result<Option<Job>> {
    let res = if let Some(msg_id) = load_imap_deletion_msgid(context).await? {
        Some(Job::new(
@@ -1191,7 +1209,7 @@ mod tests {
        // We want to ensure that loading jobs skips over jobs which
        // fails to load from the database instead of failing to load
        // all jobs.
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        insert_job(&t.ctx, -1).await; // This can not be loaded into Job struct.
        let jobs = load_next(
            &t.ctx,
@@ -1213,7 +1231,7 @@ mod tests {

    #[async_std::test]
    async fn test_load_next_job_one() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        insert_job(&t.ctx, 1).await;

--- a/src/key.rs
+++ b/src/key.rs
@@ -550,8 +550,8 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
    #[async_std::test]
    async fn test_load_self_existing() {
        let alice = alice_keypair();
-        let t = TestContext::new().await;
-        t.configure_alice().await;
+        let t = dummy_context().await;
+        configure_alice_keypair(&t.ctx).await;
        let pubkey = SignedPublicKey::load_self(&t.ctx).await.unwrap();
        assert_eq!(alice.public, pubkey);
        let seckey = SignedSecretKey::load_self(&t.ctx).await.unwrap();
@@ -560,7 +560,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD

    #[async_std::test]
    async fn test_load_self_generate_public() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx
            .set_config(Config::ConfiguredAddr, Some("alice@example.com"))
            .await
@@ -571,7 +571,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD

    #[async_std::test]
    async fn test_load_self_generate_secret() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx
            .set_config(Config::ConfiguredAddr, Some("alice@example.com"))
            .await
@@ -584,7 +584,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
    async fn test_load_self_generate_concurrent() {
        use std::thread;

-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx
            .set_config(Config::ConfiguredAddr, Some("alice@example.com"))
            .await
@@ -611,7 +611,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
    async fn test_save_self_key_twice() {
        // Saving the same key twice should result in only one row in
        // the keypairs table.
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let ctx = Arc::new(t.ctx);

        let ctx1 = ctx.clone();
--- a/src/keyring.rs
+++ b/src/keyring.rs
@@ -79,8 +79,8 @@ mod tests {
    #[async_std::test]
    async fn test_keyring_load_self() {
        // new_self() implies load_self()
-        let t = TestContext::new().await;
-        t.configure_alice().await;
+        let t = dummy_context().await;
+        configure_alice_keypair(&t.ctx).await;
        let alice = alice_keypair();

        let pub_ring: Keyring<SignedPublicKey> = Keyring::new_self(&t.ctx).await.unwrap();
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,7 +43,6 @@ pub mod constants;
 pub mod contact;
 pub mod context;
 mod e2ee;
-pub mod ephemeral;
 mod imap;
 pub mod imex;
 mod scheduler;
--- a/src/location.rs
+++ b/src/location.rs
@@ -530,7 +530,7 @@ pub async fn save(
            accuracy,
            ..
        } = location;
-        let (loc_id, ts) = context
+        context
            .sql
            .with_conn(move |mut conn| {
                let mut stmt_test = conn
@@ -569,11 +569,9 @@ pub async fn save(
                        )?;
                    }
                }
-                Ok((newest_location_id, newest_timestamp))
+                Ok(())
            })
            .await?;
-        newest_timestamp = ts;
-        newest_location_id = loc_id;
    }

    Ok(newest_location_id)
@@ -724,11 +722,11 @@ pub(crate) async fn job_maybe_send_locations_ended(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::test_utils::TestContext;
+    use crate::test_utils::dummy_context;

    #[async_std::test]
    async fn test_kml_parse() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;

        let xml =
            b"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</WHEN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></PlaceMARK>\n</Document>\n</kml>";
--- a/src/message.rs
+++ b/src/message.rs
@@ -68,6 +68,20 @@ impl MsgId {
        self.0 == 0
    }

+    /// Whether the message ID is the special marker1 marker.
+    ///
+    /// See the docs of the `dc_get_chat_msgs` C API for details.
+    pub fn is_marker1(self) -> bool {
+        self.0 == DC_MSG_ID_MARKER1
+    }
+
+    /// Whether the message ID is the special day marker.
+    ///
+    /// See the docs of the `dc_get_chat_msgs` C API for details.
+    pub fn is_daymarker(self) -> bool {
+        self.0 == DC_MSG_ID_DAYMARKER
+    }
+
    /// Put message into trash chat and delete message text.
    ///
    /// It means the message is deleted locally, but not on the server
@@ -129,7 +143,16 @@ impl MsgId {

 impl std::fmt::Display for MsgId {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Msg#{}", self.0)
+        // Would be nice if we could use match here, but no computed values in ranges.
+        if self.0 == DC_MSG_ID_MARKER1 {
+            write!(f, "Msg#Marker1")
+        } else if self.0 == DC_MSG_ID_DAYMARKER {
+            write!(f, "Msg#DayMarker")
+        } else if self.0 <= DC_MSG_ID_LAST_SPECIAL {
+            write!(f, "Msg#UnknownSpecial")
+        } else {
+            write!(f, "Msg#{}", self.0)
+        }
    }
 }

@@ -223,8 +246,6 @@ pub struct Message {
    pub(crate) timestamp_sort: i64,
    pub(crate) timestamp_sent: i64,
    pub(crate) timestamp_rcvd: i64,
-    pub(crate) ephemeral_timer: i64,
-    pub(crate) ephemeral_timestamp: i64,
    pub(crate) text: Option<String>,
    pub(crate) rfc724_mid: String,
    pub(crate) in_reply_to: Option<String>,
@@ -267,8 +288,6 @@ impl Message {
                    "    m.timestamp AS timestamp,",
                    "    m.timestamp_sent AS timestamp_sent,",
                    "    m.timestamp_rcvd AS timestamp_rcvd,",
-                    "    m.ephemeral_timer AS ephemeral_timer,",
-                    "    m.ephemeral_timestamp AS ephemeral_timestamp,",
                    "    m.type AS type,",
                    "    m.state AS state,",
                    "    m.error AS error,",
@@ -297,8 +316,6 @@ impl Message {
                    msg.timestamp_sort = row.get("timestamp")?;
                    msg.timestamp_sent = row.get("timestamp_sent")?;
                    msg.timestamp_rcvd = row.get("timestamp_rcvd")?;
-                    msg.ephemeral_timer = row.get("ephemeral_timer")?;
-                    msg.ephemeral_timestamp = row.get("ephemeral_timestamp")?;
                    msg.viewtype = row.get("type")?;
                    msg.state = row.get("state")?;
                    msg.error = row.get("error")?;
@@ -874,17 +891,6 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> String {
        ret += "\n";
    }

-    if msg.ephemeral_timer != 0 {
-        ret += &format!("Ephemeral timer: {}\n", msg.ephemeral_timer);
-    }
-
-    if msg.ephemeral_timestamp != 0 {
-        ret += &format!(
-            "Expires: {}\n",
-            dc_timestamp_to_str(msg.ephemeral_timestamp)
-        );
-    }
-
    if msg.from_id == DC_CONTACT_ID_INFO || msg.to_id == DC_CONTACT_ID_INFO {
        // device-internal message, no further details needed
        return ret;
@@ -1090,14 +1096,6 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
    let mut send_event = false;

    for (id, curr_state, curr_blocked) in msgs.into_iter() {
-        if let Err(err) = id.start_ephemeral_timer(context).await {
-            error!(
-                context,
-                "Failed to start ephemeral timer for message {}: {}", id, err
-            );
-            continue;
-        }
-
        if curr_blocked == Blocked::Not {
            if curr_state == MessageState::InFresh || curr_state == MessageState::InNoticed {
                update_msg_state(context, id, MessageState::InSeen).await;
@@ -1295,7 +1293,7 @@ pub async fn handle_mdn(
    rfc724_mid: &str,
    timestamp_sent: i64,
 ) -> Option<(ChatId, MsgId)> {
-    if from_id <= DC_CONTACT_ID_LAST_SPECIAL || rfc724_mid.is_empty() {
+    if from_id <= DC_MSG_ID_LAST_SPECIAL || rfc724_mid.is_empty() {
        return None;
    }

@@ -1647,7 +1645,7 @@ mod tests {
    async fn test_prepare_message_and_send() {
        use crate::config::Config;

-        let d = test::TestContext::new().await;
+        let d = test::dummy_context().await;
        let ctx = &d.ctx;

        let contact = Contact::create(ctx, "", "dest@example.com")
@@ -1671,7 +1669,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_summarytext_by_raw() {
-        let d = test::TestContext::new().await;
+        let d = test::dummy_context().await;
        let ctx = &d.ctx;

        let some_text = Some("bla bla".to_string());
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -9,7 +9,6 @@ use crate::contact::*;
 use crate::context::{get_version_str, Context};
 use crate::dc_tools::*;
 use crate::e2ee::*;
-use crate::ephemeral::Timer as EphemeralTimer;
 use crate::error::{bail, ensure, format_err, Error};
 use crate::location;
 use crate::message::{self, Message};
@@ -527,14 +526,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
            Loaded::MDN { .. } => dc_create_outgoing_rfc724_mid(None, &self.from_addr),
        };

-        let ephemeral_timer = self.msg.chat_id.get_ephemeral_timer(self.context).await?;
-        if let EphemeralTimer::Enabled { duration } = ephemeral_timer {
-            protected_headers.push(Header::new(
-                "Ephemeral-Timer".to_string(),
-                duration.to_string(),
-            ));
-        }
-
        // we could also store the message-id in the protected headers
        // which would probably help to survive providers like
        // Outlook.com or hotmail which mangle the Message-ID.
@@ -785,12 +776,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                    "location-streaming-enabled".into(),
                ));
            }
-            SystemMessage::EphemeralTimerChanged => {
-                protected_headers.push(Header::new(
-                    "Chat-Content".to_string(),
-                    "ephemeral-timer-changed".to_string(),
-                ));
-            }
            SystemMessage::AutocryptSetupMessage => {
                unprotected_headers
                    .push(Header::new("Autocrypt-Setup-Message".into(), "v1".into()));
@@ -1225,6 +1210,7 @@ mod tests {
    use crate::chatlist::Chatlist;
    use crate::dc_receive_imf::dc_receive_imf;
    use crate::mimeparser::*;
+    use crate::test_utils::configured_offline_context;
    use crate::test_utils::TestContext;

    #[test]
@@ -1314,10 +1300,10 @@ mod tests {
        // 1.: Receive a mail from an MUA or Delta Chat
        assert_eq!(
            msg_to_subject_str(
-                b"From: Bob <bob@example.com>\n\
-                To: alice@example.com\n\
+                b"From: Bob <bob@example.org>\n\
+                To: alice@example.org\n\
                Subject: Antw: Chat: hello\n\
-                Message-ID: <2222@example.com>\n\
+                Message-ID: <2222@example.org>\n\
                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
                \n\
                hello\n"
@@ -1328,10 +1314,10 @@ mod tests {

        assert_eq!(
            msg_to_subject_str(
-                b"From: Bob <bob@example.com>\n\
-                To: alice@example.com\n\
+                b"From: Bob <bob@example.org>\n\
+                To: alice@example.org\n\
                Subject: Infos: 42\n\
-                Message-ID: <2222@example.com>\n\
+                Message-ID: <2222@example.org>\n\
                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
                \n\
                hello\n"
@@ -1343,11 +1329,11 @@ mod tests {
        // 2. Receive a message from Delta Chat when we did not send any messages before
        assert_eq!(
            msg_to_subject_str(
-                b"From: Charlie <charlie@example.com>\n\
-                To: alice@example.com\n\
+                b"From: Charlie <charlie@example.org>\n\
+                To: alice@example.org\n\
                Subject: Chat: hello\n\
                Chat-Version: 1.0\n\
-                Message-ID: <2223@example.com>\n\
+                Message-ID: <2223@example.org>\n\
                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
                \n\
                hello\n"
@@ -1357,11 +1343,10 @@ mod tests {
        );

        // 3. Send the first message to a new contact
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
+        assert_eq!(first_subject_str(t).await, "Message from alice@example.org");

-        assert_eq!(first_subject_str(t).await, "Message from alice@example.com");
-
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        t.ctx
            .set_config(Config::Displayname, Some("Alice"))
            .await
@@ -1370,11 +1355,11 @@ mod tests {

        // 4. Receive messages with unicode characters and make sure that we do not panic (we do not care about the result)
        msg_to_subject_str(
-            "From: Charlie <charlie@example.com>\n\
-            To: alice@example.com\n\
+            "From: Charlie <charlie@example.org>\n\
+            To: alice@example.org\n\
            Subject: äääää\n\
            Chat-Version: 1.0\n\
-            Message-ID: <2893@example.com>\n\
+            Message-ID: <2893@example.org>\n\
            Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
            \n\
            hello\n"
@@ -1383,11 +1368,11 @@ mod tests {
        .await;

        msg_to_subject_str(
-            "From: Charlie <charlie@example.com>\n\
-            To: alice@example.com\n\
+            "From: Charlie <charlie@example.org>\n\
+            To: alice@example.org\n\
            Subject: aäääää\n\
            Chat-Version: 1.0\n\
-            Message-ID: <2893@example.com>\n\
+            Message-ID: <2893@example.org>\n\
            Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
            \n\
            hello\n"
@@ -1398,7 +1383,7 @@ mod tests {

    async fn first_subject_str(t: TestContext) -> String {
        let contact_id =
-            Contact::add_or_lookup(&t.ctx, "Dave", "dave@example.com", Origin::ManuallyCreated)
+            Contact::add_or_lookup(&t.ctx, "Dave", "dave@example.org", Origin::ManuallyCreated)
                .await
                .unwrap()
                .0;
@@ -1422,7 +1407,7 @@ mod tests {
    }

    async fn msg_to_subject_str(imf_raw: &[u8]) -> String {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        let new_msg = incoming_msg_to_reply_msg(imf_raw, &t.ctx).await;
        let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false)
            .await
@@ -1460,15 +1445,15 @@ mod tests {
    #[async_std::test]
    // This test could still be extended
    async fn test_render_reply() {
-        let t = TestContext::new_alice().await;
+        let t = configured_offline_context().await;
        let context = &t.ctx;

        let msg = incoming_msg_to_reply_msg(
-            b"From: Charlie <charlie@example.com>\n\
-                To: alice@example.com\n\
+            b"From: Charlie <charlie@example.org>\n\
+                To: alice@example.org\n\
                Subject: Chat: hello\n\
                Chat-Version: 1.0\n\
-                Message-ID: <2223@example.com>\n\
+                Message-ID: <2223@example.org>\n\
                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
                \n\
                hello\n",
@@ -1479,7 +1464,7 @@ mod tests {
        let mimefactory = MimeFactory::from_msg(&t.ctx, &msg, false).await.unwrap();

        let recipients = mimefactory.recipients();
-        assert_eq!(recipients, vec!["charlie@example.com"]);
+        assert_eq!(recipients, vec!["charlie@example.org"]);

        let rendered_msg = mimefactory.render().await.unwrap();

--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -76,9 +76,6 @@ pub enum SystemMessage {
    SecurejoinMessage = 7,
    LocationStreamingEnabled = 8,
    LocationOnly = 9,
-
-    /// Chat ephemeral message timer is changed.
-    EphemeralTimerChanged = 10,
 }

 impl Default for SystemMessage {
@@ -217,8 +214,6 @@ impl MimeMessage {
        } else if let Some(value) = self.get(HeaderDef::ChatContent) {
            if value == "location-streaming-enabled" {
                self.is_system_message = SystemMessage::LocationStreamingEnabled;
-            } else if value == "ephemeral-timer-changed" {
-                self.is_system_message = SystemMessage::EphemeralTimerChanged;
            }
        }
        Ok(())
@@ -262,8 +257,7 @@ impl MimeMessage {
                self.parts[0].msg = "".to_string();

                // swap new with old
-                self.parts.push(filepart); // push to the end
-                let _ = self.parts.swap_remove(0); // drops first element, replacing it with the last one in O(1)
+                std::mem::replace(&mut self.parts[0], filepart);
            }
        }
    }
@@ -909,13 +903,16 @@ impl MimeMessage {
    /// If you improve heuristics here you might also have to change prefetch_should_download() in imap/mod.rs.
    /// Also you should add a test in dc_receive_imf.rs (there already are lots of test_parse_ndn_* tests).
    async fn heuristically_parse_ndn(&mut self, context: &Context) -> Option<()> {
-        let maybe_ndn = if let Some(from) = self.get(HeaderDef::From_) {
-            let from = from.to_ascii_lowercase();
-            from.contains("mailer-daemon") || from.contains("mail-daemon")
-        } else {
-            false
-        };
-        if maybe_ndn && self.failure_report.is_none() {
+        if self
+            .get(HeaderDef::Subject)?
+            .to_ascii_lowercase()
+            .contains("fail")
+            && self
+                .get(HeaderDef::From_)?
+                .to_ascii_lowercase()
+                .contains("mailer-daemon")
+            && self.failure_report.is_none()
+        {
            lazy_static! {
                static ref RE: regex::Regex = regex::Regex::new(r"Message-ID:(.*)").unwrap();
            }
@@ -1242,7 +1239,7 @@ mod tests {

    #[async_std::test]
    async fn test_dc_mimeparser_crash() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = include_bytes!("../test-data/message/issue_523.txt");
        let mimeparser = MimeMessage::from_bytes(&context.ctx, &raw[..])
            .await
@@ -1254,7 +1251,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_rfc724_mid_exists() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = include_bytes!("../test-data/message/mail_with_message_id.txt");
        let mimeparser = MimeMessage::from_bytes(&context.ctx, &raw[..])
            .await
@@ -1268,7 +1265,7 @@ mod tests {

    #[async_std::test]
    async fn test_get_rfc724_mid_not_exists() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = include_bytes!("../test-data/message/issue_523.txt");
        let mimeparser = MimeMessage::from_bytes(&context.ctx, &raw[..])
            .await
@@ -1326,7 +1323,7 @@ mod tests {

    #[async_std::test]
    async fn test_parse_first_addr() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = b"From: hello@one.org, world@two.org\n\
                    Chat-Disposition-Notification-To: wrong\n\
                    Content-Type: text/plain\n\
@@ -1347,7 +1344,7 @@ mod tests {

    #[async_std::test]
    async fn test_mimeparser_with_context() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = b"From: hello\n\
                    Content-Type: multipart/mixed; boundary=\"==break==\";\n\
                    Subject: outer-subject\n\
@@ -1397,7 +1394,7 @@ mod tests {

    #[async_std::test]
    async fn test_mimeparser_with_avatars() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;

        let raw = include_bytes!("../test-data/message/mail_attach_txt.eml");
        let mimeparser = MimeMessage::from_bytes(&t.ctx, &raw[..]).await.unwrap();
@@ -1440,7 +1437,7 @@ mod tests {

    #[async_std::test]
    async fn test_mimeparser_message_kml() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = b"Chat-Version: 1.0\n\
 From: foo <foo@example.org>\n\
 To: bar <bar@example.org>\n\
@@ -1485,7 +1482,7 @@ Content-Disposition: attachment; filename=\"message.kml\"\n\

    #[async_std::test]
    async fn test_parse_mdn() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = b"Subject: =?utf-8?q?Chat=3A_Message_opened?=\n\
 Date: Mon, 10 Jan 2020 00:00:00 +0000\n\
 Chat-Version: 1.0\n\
@@ -1535,7 +1532,7 @@ Disposition: manual-action/MDN-sent-automatically; displayed\n\
    /// multipart MIME messages.
    #[async_std::test]
    async fn test_parse_multiple_mdns() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = b"Subject: =?utf-8?q?Chat=3A_Message_opened?=\n\
 Date: Mon, 10 Jan 2020 00:00:00 +0000\n\
 Chat-Version: 1.0\n\
@@ -1611,7 +1608,7 @@ Disposition: manual-action/MDN-sent-automatically; displayed\n\

    #[async_std::test]
    async fn test_parse_mdn_with_additional_message_ids() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = b"Subject: =?utf-8?q?Chat=3A_Message_opened?=\n\
 Date: Mon, 10 Jan 2020 00:00:00 +0000\n\
 Chat-Version: 1.0\n\
@@ -1666,7 +1663,7 @@ Additional-Message-IDs: <foo@example.com> <foo@example.net>\n\

    #[async_std::test]
    async fn test_parse_inline_attachment() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = br#"Date: Thu, 13 Feb 2020 22:41:20 +0000 (UTC)
 From: sender@example.com
 To: receiver@example.com
@@ -1706,7 +1703,7 @@ MDYyMDYxNTE1RTlDOEE4Cj4+CnN0YXJ0eHJlZgo4Mjc4CiUlRU9GCg==

    #[async_std::test]
    async fn parse_inline_image() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = br#"Message-ID: <foobar@example.org>
 From: foo <foo@example.org>
 Subject: example
@@ -1752,7 +1749,7 @@ CWt6wx7fiLp0qS9RrX75g6Gqw7nfCs6EcBERcIPt7DTe8VStJwf3LWqVwxl4gQl46yhfoqwEO+I=

    #[async_std::test]
    async fn parse_thunderbird_html_embedded_image() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = br#"To: Alice <alice@example.org>
 From: Bob <bob@example.org>
 Subject: Test subject
@@ -1825,7 +1822,7 @@ CWt6wx7fiLp0qS9RrX75g6Gqw7nfCs6EcBERcIPt7DTe8VStJwf3LWqVwxl4gQl46yhfoqwEO+I=
    // Outlook specifies filename in the "name" attribute of Content-Type
    #[async_std::test]
    async fn parse_outlook_html_embedded_image() {
-        let context = TestContext::new().await;
+        let context = dummy_context().await;
        let raw = br##"From: Anonymous <anonymous@example.org>
 To: Anonymous <anonymous@example.org>
 Subject: Delta Chat is great stuff!
--- a/src/oauth2.rs
+++ b/src/oauth2.rs
@@ -9,8 +9,6 @@ use serde::Deserialize;

 use crate::context::Context;
 use crate::dc_tools::*;
-use crate::provider;
-use crate::provider::Oauth2Authorizer;

 const OAUTH2_GMAIL: Oauth2 = Oauth2 {
    // see https://developers.google.com/identity/protocols/OAuth2InstalledApp
@@ -278,12 +276,8 @@ impl Oauth2 {
            .find('@')
            .map(|index| addr_normalized.split_at(index + 1).1)
        {
-            if let Some(provider) = provider::get_provider_info(&addr_normalized) {
-                match &provider.oauth2_authorizer {
-                    Some(Oauth2Authorizer::Gmail) => Some(OAUTH2_GMAIL),
-                    Some(Oauth2Authorizer::Yandex) => Some(OAUTH2_YANDEX),
-                    None => None, // provider known to not support oauth2, no mx-lookup required
-                }
+            if let Some(provider) = Oauth2::lookup_whitelist(domain) {
+                Some(provider)
            } else {
                Oauth2::lookup_mx(domain).await
            }
@@ -292,6 +286,16 @@ impl Oauth2 {
        }
    }

+    fn lookup_whitelist(domain: impl AsRef<str>) -> Option<Self> {
+        let domain = domain.as_ref();
+        match domain {
+            "gmail.com" | "googlemail.com" => Some(OAUTH2_GMAIL),
+            "yandex.com" | "yandex.by" | "yandex.kz" | "yandex.ru" | "yandex.ua" | "ya.ru"
+            | "narod.ru" => Some(OAUTH2_YANDEX),
+            _ => None,
+        }
+    }
+
    async fn lookup_mx(domain: impl AsRef<str>) -> Option<Self> {
        if let Ok(resolver) = resolver(
            config::ResolverConfig::default(),
@@ -436,7 +440,7 @@ mod tests {

    #[async_std::test]
    async fn test_dc_get_oauth2_addr() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;
        let addr = "dignifiedquire@gmail.com";
        let code = "fail";
        let res = dc_get_oauth2_addr(&ctx.ctx, addr, code).await;
@@ -446,7 +450,7 @@ mod tests {

    #[async_std::test]
    async fn test_dc_get_oauth2_url() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;
        let addr = "dignifiedquire@gmail.com";
        let redirect_uri = "chat.delta:/com.b44t.messenger";
        let res = dc_get_oauth2_url(&ctx.ctx, addr, redirect_uri).await;
@@ -456,7 +460,7 @@ mod tests {

    #[async_std::test]
    async fn test_dc_get_oauth2_token() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;
        let addr = "dignifiedquire@gmail.com";
        let code = "fail";
        let res = dc_get_oauth2_access_token(&ctx.ctx, addr, code, false).await;
--- a/src/param.rs
+++ b/src/param.rs
@@ -414,7 +414,7 @@ mod tests {

    #[async_std::test]
    async fn test_params_file_fs_path() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        if let ParamsFile::FsPath(p) = ParamsFile::from_param(&t.ctx, "/foo/bar/baz").unwrap() {
            assert_eq!(p, Path::new("/foo/bar/baz"));
        } else {
@@ -424,7 +424,7 @@ mod tests {

    #[async_std::test]
    async fn test_params_file_blob() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        if let ParamsFile::Blob(b) = ParamsFile::from_param(&t.ctx, "$BLOBDIR/foo").unwrap() {
            assert_eq!(b.as_name(), "$BLOBDIR/foo");
        } else {
@@ -435,7 +435,7 @@ mod tests {
    // Tests for Params::get_file(), Params::get_path() and Params::get_blob().
    #[async_std::test]
    async fn test_params_get_fileparam() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let fname = t.dir.path().join("foo");
        let mut p = Params::new();
        p.set(Param::File, fname.to_str().unwrap());
--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -1,5 +1,6 @@
 //! # [Autocrypt Peer State](https://autocrypt.org/level1.html#peer-state-management) module
 use std::collections::HashSet;
+use std::convert::TryFrom;
 use std::fmt;

 use num_traits::FromPrimitive;
@@ -323,9 +324,11 @@ impl<'a> Peerstate<'a> {

    pub fn render_gossip_header(&self, min_verified: PeerstateVerifiedStatus) -> Option<String> {
        if let Some(key) = self.peek_key(min_verified) {
+            // TODO: avoid cloning
+            let public_key = SignedPublicKey::try_from(key.clone()).ok()?;
            let header = Aheader::new(
                self.addr.clone(),
-                key.clone(), // TODO: avoid cloning
+                public_key,
                // Autocrypt 1.1.0 specification says that
                // `prefer-encrypt` attribute SHOULD NOT be included,
                // but we include it anyway to propagate encryption
@@ -470,7 +473,7 @@ mod tests {

    #[async_std::test]
    async fn test_peerstate_save_to_db() {
-        let ctx = crate::test_utils::TestContext::new().await;
+        let ctx = crate::test_utils::dummy_context().await;
        let addr = "hello@mail.com";

        let pub_key = alice_keypair().public;
@@ -513,7 +516,7 @@ mod tests {

    #[async_std::test]
    async fn test_peerstate_double_create() {
-        let ctx = crate::test_utils::TestContext::new().await;
+        let ctx = crate::test_utils::dummy_context().await;
        let addr = "hello@mail.com";
        let pub_key = alice_keypair().public;

@@ -546,7 +549,7 @@ mod tests {

    #[async_std::test]
    async fn test_peerstate_with_empty_gossip_key_save_to_db() {
-        let ctx = crate::test_utils::TestContext::new().await;
+        let ctx = crate::test_utils::dummy_context().await;
        let addr = "hello@mail.com";

        let pub_key = alice_keypair().public;
--- a/src/provider/data.rs
+++ b/src/provider/data.rs
@@ -20,7 +20,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // aol.md: aol.com
@@ -33,22 +32,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
-    };
-
-    // arcor.de.md: arcor.de
-    static ref P_ARCOR_DE: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/arcor-de",
-        server: vec![
-            Server { protocol: IMAP, socket: SSL, hostname: "imap.arcor.de", port: 993, username_pattern: EMAIL },
-            Server { protocol: SMTP, socket: SSL, hostname: "mail.arcor.de", port: 465, username_pattern: EMAIL },
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // autistici.org.md: autistici.org
@@ -63,7 +46,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // bluewin.ch.md: bluewin.ch
@@ -78,7 +60,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // chello.at.md: chello.at
@@ -93,34 +74,13 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // comcast.md: xfinity.com, comcast.net
-    static ref P_COMCAST: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/comcast",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // dismail.de.md: dismail.de
-    static ref P_DISMAIL_DE: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/dismail-de",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // disroot.md: disroot.org
    static ref P_DISROOT: Provider = Provider {
@@ -132,25 +92,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: None,
-    };
-
-    // dubby.org.md: dubby.org
-    static ref P_DUBBY_ORG: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/dubby-org",
-        server: vec![
-        ],
-        config_defaults: Some(vec![
-            ConfigDefault { key: Config::BccSelf, value: "1" },
-            ConfigDefault { key: Config::SentboxWatch, value: "0" },
-            ConfigDefault { key: Config::MvboxWatch, value: "0" },
-            ConfigDefault { key: Config::MvboxMove, value: "0" },
-        ]),
-        strict_tls: true,
-        oauth2_authorizer: None,
    };

    // example.com.md: example.com, example.org
@@ -165,7 +106,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // fastmail.md: fastmail.com
@@ -178,7 +118,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // five.chat.md: five.chat
@@ -189,14 +128,8 @@ lazy_static::lazy_static! {
        overview_page: "https://providers.delta.chat/five-chat",
        server: vec![
        ],
-        config_defaults: Some(vec![
-            ConfigDefault { key: Config::BccSelf, value: "1" },
-            ConfigDefault { key: Config::SentboxWatch, value: "0" },
-            ConfigDefault { key: Config::MvboxWatch, value: "0" },
-            ConfigDefault { key: Config::MvboxMove, value: "0" },
-        ]),
+        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: None,
    };

    // freenet.de.md: freenet.de
@@ -211,7 +144,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // gmail.md: gmail.com, googlemail.com
@@ -226,7 +158,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: Some(Oauth2Authorizer::Gmail),
    };

    // gmx.net.md: gmx.net, gmx.de, gmx.at, gmx.ch, gmx.org, gmx.eu, gmx.info, gmx.biz, gmx.com
@@ -242,34 +173,10 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
-    };
-
-    // hey.com.md: hey.com
-    static ref P_HEY_COM: Provider = Provider {
-        status: Status::BROKEN,
-        before_login_hint: "hey.com does not offer the standard IMAP e-mail protocol, so you cannot log in with Delta Chat to hey.com.",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/hey-com",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // i.ua.md: i.ua
-    static ref P_I_UA: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/i-ua",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // icloud.md: icloud.com, me.com, mac.com
    static ref P_ICLOUD: Provider = Provider {
@@ -283,47 +190,16 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // kolst.com.md: kolst.com
-    static ref P_KOLST_COM: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/kolst-com",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // kontent.com.md: kontent.com
-    static ref P_KONTENT_COM: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/kontent-com",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // mail.ru.md: mail.ru, inbox.ru, bk.ru, list.ru
-    static ref P_MAIL_RU: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/mail-ru",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // mailbox.org.md: mailbox.org, secure.mailbox.org
    static ref P_MAILBOX_ORG: Provider = Provider {
@@ -335,7 +211,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: None,
    };

    // nauta.cu.md: nauta.cu
@@ -358,7 +233,6 @@ lazy_static::lazy_static! {
            ConfigDefault { key: Config::MediaQuality, value: "1" },
        ]),
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // outlook.com.md: hotmail.com, outlook.com, office365.com, outlook.com.tr, live.com
@@ -373,7 +247,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // posteo.md: posteo.de, posteo.af, posteo.at, posteo.be, posteo.ch, posteo.cl, posteo.co, posteo.co.uk, posteo.com.br, posteo.cr, posteo.cz, posteo.dk, posteo.ee, posteo.es, posteo.eu, posteo.fi, posteo.gl, posteo.gr, posteo.hn, posteo.hr, posteo.hu, posteo.ie, posteo.in, posteo.is, posteo.jp, posteo.la, posteo.li, posteo.lt, posteo.lu, posteo.me, posteo.mx, posteo.my, posteo.net, posteo.nl, posteo.no, posteo.nz, posteo.org, posteo.pe, posteo.pl, posteo.pm, posteo.pt, posteo.ro, posteo.ru, posteo.se, posteo.sg, posteo.si, posteo.tn, posteo.uk, posteo.us
@@ -388,7 +261,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: None,
    };

    // protonmail.md: protonmail.com, protonmail.ch
@@ -401,7 +273,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // riseup.net.md: riseup.net
@@ -414,21 +285,10 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: None,
    };

    // rogers.com.md: rogers.com
-    static ref P_ROGERS_COM: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/rogers-com",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // systemli.org.md: systemli.org
    static ref P_SYSTEMLI_ORG: Provider = Provider {
@@ -440,7 +300,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: None,
    };

    // t-online.md: t-online.de, magenta.de
@@ -453,7 +312,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // testrun.md: testrun.org
@@ -467,14 +325,8 @@ lazy_static::lazy_static! {
            Server { protocol: IMAP, socket: STARTTLS, hostname: "testrun.org", port: 143, username_pattern: EMAIL },
            Server { protocol: SMTP, socket: STARTTLS, hostname: "testrun.org", port: 587, username_pattern: EMAIL },
        ],
-        config_defaults: Some(vec![
-            ConfigDefault { key: Config::BccSelf, value: "1" },
-            ConfigDefault { key: Config::SentboxWatch, value: "0" },
-            ConfigDefault { key: Config::MvboxWatch, value: "0" },
-            ConfigDefault { key: Config::MvboxMove, value: "0" },
-        ]),
+        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: None,
    };

    // tiscali.it.md: tiscali.it
@@ -489,34 +341,13 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // ukr.net.md: ukr.net
-    static ref P_UKR_NET: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/ukr-net",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // vfemail.md: vfemail.net
-    static ref P_VFEMAIL: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/vfemail",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: false,
-        oauth2_authorizer: None,
-    };
+    // - skipping provider with status OK and no special things to do

    // web.de.md: web.de, email.de, flirt.ms, hallo.ms, kuss.ms, love.ms, magic.ms, singles.ms, cool.ms, kanzler.ms, okay.ms, party.ms, pop.ms, stars.ms, techno.ms, clever.ms, deutschland.ms, genial.ms, ich.ms, online.ms, smart.ms, wichtig.ms, action.ms, fussball.ms, joker.ms, planet.ms, power.ms
    static ref P_WEB_DE: Provider = Provider {
@@ -531,7 +362,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    // yahoo.md: yahoo.com, yahoo.de, yahoo.it, yahoo.fr, yahoo.es, yahoo.se, yahoo.co.uk, yahoo.co.nz, yahoo.com.au, yahoo.com.ar, yahoo.com.br, yahoo.com.mx, ymail.com, rocketmail.com, yahoodns.net
@@ -546,10 +376,9 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

-    // yandex.ru.md: yandex.com, yandex.by, yandex.kz, yandex.ru, yandex.ua, ya.ru, narod.ru
+    // yandex.ru.md: yandex.ru, yandex.com
    static ref P_YANDEX_RU: Provider = Provider {
        status: Status::PREPARATION,
        before_login_hint: "For Yandex accounts, you have to set IMAP protocol option turned on.",
@@ -559,7 +388,6 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: true,
-        oauth2_authorizer: Some(Oauth2Authorizer::Yandex),
    };

    // ziggo.nl.md: ziggo.nl
@@ -574,21 +402,15 @@ lazy_static::lazy_static! {
        ],
        config_defaults: None,
        strict_tls: false,
-        oauth2_authorizer: None,
    };

    pub static ref PROVIDER_DATA: HashMap<&'static str, &'static Provider> = [
        ("aktivix.org", &*P_AKTIVIX_ORG),
        ("aol.com", &*P_AOL),
-        ("arcor.de", &*P_ARCOR_DE),
        ("autistici.org", &*P_AUTISTICI_ORG),
        ("bluewin.ch", &*P_BLUEWIN_CH),
        ("chello.at", &*P_CHELLO_AT),
-        ("xfinity.com", &*P_COMCAST),
-        ("comcast.net", &*P_COMCAST),
-        ("dismail.de", &*P_DISMAIL_DE),
        ("disroot.org", &*P_DISROOT),
-        ("dubby.org", &*P_DUBBY_ORG),
        ("example.com", &*P_EXAMPLE_COM),
        ("example.org", &*P_EXAMPLE_COM),
        ("fastmail.com", &*P_FASTMAIL),
@@ -605,17 +427,9 @@ lazy_static::lazy_static! {
        ("gmx.info", &*P_GMX_NET),
        ("gmx.biz", &*P_GMX_NET),
        ("gmx.com", &*P_GMX_NET),
-        ("hey.com", &*P_HEY_COM),
-        ("i.ua", &*P_I_UA),
        ("icloud.com", &*P_ICLOUD),
        ("me.com", &*P_ICLOUD),
        ("mac.com", &*P_ICLOUD),
-        ("kolst.com", &*P_KOLST_COM),
-        ("kontent.com", &*P_KONTENT_COM),
-        ("mail.ru", &*P_MAIL_RU),
-        ("inbox.ru", &*P_MAIL_RU),
-        ("bk.ru", &*P_MAIL_RU),
-        ("list.ru", &*P_MAIL_RU),
        ("mailbox.org", &*P_MAILBOX_ORG),
        ("secure.mailbox.org", &*P_MAILBOX_ORG),
        ("nauta.cu", &*P_NAUTA_CU),
@@ -676,14 +490,11 @@ lazy_static::lazy_static! {
        ("protonmail.com", &*P_PROTONMAIL),
        ("protonmail.ch", &*P_PROTONMAIL),
        ("riseup.net", &*P_RISEUP_NET),
-        ("rogers.com", &*P_ROGERS_COM),
        ("systemli.org", &*P_SYSTEMLI_ORG),
        ("t-online.de", &*P_T_ONLINE),
        ("magenta.de", &*P_T_ONLINE),
        ("testrun.org", &*P_TESTRUN),
        ("tiscali.it", &*P_TISCALI_IT),
-        ("ukr.net", &*P_UKR_NET),
-        ("vfemail.net", &*P_VFEMAIL),
        ("web.de", &*P_WEB_DE),
        ("email.de", &*P_WEB_DE),
        ("flirt.ms", &*P_WEB_DE),
@@ -726,13 +537,8 @@ lazy_static::lazy_static! {
        ("ymail.com", &*P_YAHOO),
        ("rocketmail.com", &*P_YAHOO),
        ("yahoodns.net", &*P_YAHOO),
-        ("yandex.com", &*P_YANDEX_RU),
-        ("yandex.by", &*P_YANDEX_RU),
-        ("yandex.kz", &*P_YANDEX_RU),
        ("yandex.ru", &*P_YANDEX_RU),
-        ("yandex.ua", &*P_YANDEX_RU),
-        ("ya.ru", &*P_YANDEX_RU),
-        ("narod.ru", &*P_YANDEX_RU),
+        ("yandex.com", &*P_YANDEX_RU),
        ("ziggo.nl", &*P_ZIGGO_NL),
    ].iter().copied().collect();
 }
--- a/src/provider/mod.rs
+++ b/src/provider/mod.rs
@@ -35,13 +35,6 @@ pub enum UsernamePattern {
    EMAILLOCALPART = 2,
 }

-#[derive(Debug, PartialEq)]
-#[repr(u8)]
-pub enum Oauth2Authorizer {
-    Yandex = 1,
-    Gmail = 2,
-}
-
 #[derive(Debug)]
 pub struct Server {
    pub protocol: Protocol,
@@ -80,7 +73,6 @@ pub struct Provider {
    pub server: Vec<Server>,
    pub config_defaults: Option<Vec<ConfigDefault>>,
    pub strict_tls: bool,
-    pub oauth2_authorizer: Option<Oauth2Authorizer>,
 }

 impl Provider {
--- a/src/provider/update.py
+++ b/src/provider/update.py
@@ -103,9 +103,6 @@ def process_data(data, file):
    strict_tls = data.get("strict_tls", False)
    strict_tls = "true" if strict_tls else "false"

-    oauth2 = data.get("oauth2", "")
-    oauth2 = "Some(Oauth2Authorizer::" + camel(oauth2) + ")" if oauth2 != "" else "None"
-
    provider = ""
    before_login_hint = cleanstr(data.get("before_login_hint", ""))
    after_login_hint = cleanstr(data.get("after_login_hint", ""))
@@ -118,7 +115,6 @@ def process_data(data, file):
        provider += "        server: vec![\n" + server + "        ],\n"
        provider += "        config_defaults: " + config_defaults + ",\n"
        provider += "        strict_tls: " + strict_tls + ",\n"
-        provider += "        oauth2_authorizer: " + oauth2 + ",\n"
        provider += "    };\n\n"
    else:
        raise TypeError("SMTP and IMAP must be specified together or left out both")
@@ -129,11 +125,11 @@ def process_data(data, file):
    # finally, add the provider
    global out_all, out_domains
    out_all += "    // " + file[file.rindex("/")+1:] + ": " + comment.strip(", ") + "\n"
-
-    # also add provider with no special things to do -
-    # eg. _not_ supporting oauth2 is also an information and we can skip the mx-lookup in this case
-    out_all += provider
-    out_domains += domains
+    if status == "OK" and before_login_hint == "" and after_login_hint == "" and server == "" and config_defaults == "None" and strict_tls == "false":
+        out_all += "    // - skipping provider with status OK and no special things to do\n\n"
+    else:
+        out_all += provider
+        out_domains += domains


 def process_file(file):
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -383,11 +383,11 @@ fn normalize_address(addr: &str) -> Result<String, Error> {
 mod tests {
    use super::*;

-    use crate::test_utils::TestContext;
+    use crate::test_utils::dummy_context;

    #[async_std::test]
    async fn test_decode_http() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(&ctx.ctx, "http://www.hello.com").await;

@@ -399,7 +399,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_https() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(&ctx.ctx, "https://www.hello.com").await;

@@ -411,7 +411,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_text() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(&ctx.ctx, "I am so cool").await;

@@ -423,7 +423,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_vcard() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(
            &ctx.ctx,
@@ -441,7 +441,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_matmsg() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(
            &ctx.ctx,
@@ -459,7 +459,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_mailto() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(
            &ctx.ctx,
@@ -485,7 +485,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_smtp() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(&ctx.ctx, "SMTP:stress@test.local:subjecthello:bodyworld").await;

@@ -499,7 +499,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_openpgp_group() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(
            &ctx.ctx,
@@ -528,7 +528,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_openpgp_secure_join() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(
            &ctx.ctx,
@@ -556,7 +556,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_openpgp_without_addr() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(
            &ctx.ctx,
@@ -591,7 +591,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_account() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;

        let res = check_qr(
            &ctx.ctx,
@@ -613,7 +613,7 @@ mod tests {

    #[async_std::test]
    async fn test_decode_account_bad_scheme() {
-        let ctx = TestContext::new().await;
+        let ctx = dummy_context().await;
        let res = check_qr(
            &ctx.ctx,
            "DCACCOUNT:http://example.org/new_email?t=1w_7wDjgjelxeX884x96v3",
--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -1,5 +1,3 @@
-#![warn(clippy::indexing_slicing)]
-
 use async_std::prelude::*;
 use async_std::sync::{channel, Receiver, Sender};
 use async_std::task;
@@ -38,6 +36,14 @@ impl Context {
        self.scheduler.read().await.interrupt_inbox(info).await;
    }

+    pub(crate) async fn interrupt_sentbox(&self, info: InterruptInfo) {
+        self.scheduler.read().await.interrupt_sentbox(info).await;
+    }
+
+    pub(crate) async fn interrupt_mvbox(&self, info: InterruptInfo) {
+        self.scheduler.read().await.interrupt_mvbox(info).await;
+    }
+
    pub(crate) async fn interrupt_smtp(&self, info: InterruptInfo) {
        self.scheduler.read().await.interrupt_smtp(info).await;
    }
@@ -76,11 +82,7 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
                }
                None => {
                    jobs_loaded = 0;
-                    info = if ctx.get_config_bool(Config::InboxWatch).await {
-                        fetch_idle(&ctx, &mut connection, Config::ConfiguredInboxFolder).await
-                    } else {
-                        connection.fake_idle(&ctx, None).await
-                    };
+                    info = fetch_idle(&ctx, &mut connection, Config::ConfiguredInboxFolder).await;
                }
            }
        }
@@ -241,21 +243,29 @@ impl Scheduler {
        let (smtp, smtp_handlers) = SmtpConnectionState::new();
        let (inbox, inbox_handlers) = ImapConnectionState::new();

+        *self = Scheduler::Running {
+            inbox,
+            mvbox,
+            sentbox,
+            smtp,
+            inbox_handle: None,
+            mvbox_handle: None,
+            sentbox_handle: None,
+            smtp_handle: None,
+        };
+
        let (inbox_start_send, inbox_start_recv) = channel(1);
-        let (mvbox_start_send, mvbox_start_recv) = channel(1);
-        let mut mvbox_handle = None;
-        let (sentbox_start_send, sentbox_start_recv) = channel(1);
-        let mut sentbox_handle = None;
-        let (smtp_start_send, smtp_start_recv) = channel(1);
-
-        let ctx1 = ctx.clone();
-        let inbox_handle = Some(task::spawn(async move {
-            inbox_loop(ctx1, inbox_start_send, inbox_handlers).await
-        }));
-
-        if ctx.get_config_bool(Config::MvboxWatch).await {
+        if let Scheduler::Running { inbox_handle, .. } = self {
            let ctx1 = ctx.clone();
-            mvbox_handle = Some(task::spawn(async move {
+            *inbox_handle = Some(task::spawn(async move {
+                inbox_loop(ctx1, inbox_start_send, inbox_handlers).await
+            }));
+        }
+
+        let (mvbox_start_send, mvbox_start_recv) = channel(1);
+        if let Scheduler::Running { mvbox_handle, .. } = self {
+            let ctx1 = ctx.clone();
+            *mvbox_handle = Some(task::spawn(async move {
                simple_imap_loop(
                    ctx1,
                    mvbox_start_send,
@@ -264,13 +274,12 @@ impl Scheduler {
                )
                .await
            }));
-        } else {
-            mvbox_start_send.send(()).await;
        }

-        if ctx.get_config_bool(Config::SentboxWatch).await {
+        let (sentbox_start_send, sentbox_start_recv) = channel(1);
+        if let Scheduler::Running { sentbox_handle, .. } = self {
            let ctx1 = ctx.clone();
-            sentbox_handle = Some(task::spawn(async move {
+            *sentbox_handle = Some(task::spawn(async move {
                simple_imap_loop(
                    ctx1,
                    sentbox_start_send,
@@ -279,25 +288,15 @@ impl Scheduler {
                )
                .await
            }));
-        } else {
-            sentbox_start_send.send(()).await;
        }

-        let ctx1 = ctx.clone();
-        let smtp_handle = Some(task::spawn(async move {
-            smtp_loop(ctx1, smtp_start_send, smtp_handlers).await
-        }));
-
-        *self = Scheduler::Running {
-            inbox,
-            mvbox,
-            sentbox,
-            smtp,
-            inbox_handle,
-            mvbox_handle,
-            sentbox_handle,
-            smtp_handle,
-        };
+        let (smtp_start_send, smtp_start_recv) = channel(1);
+        if let Scheduler::Running { smtp_handle, .. } = self {
+            let ctx1 = ctx.clone();
+            *smtp_handle = Some(task::spawn(async move {
+                smtp_loop(ctx1, smtp_start_send, smtp_handlers).await
+            }));
+        }

        // wait for all loops to be started
        if let Err(err) = inbox_start_recv
@@ -387,18 +386,10 @@ impl Scheduler {
                smtp_handle,
                ..
            } => {
-                if let Some(handle) = inbox_handle.take() {
-                    handle.await;
-                }
-                if let Some(handle) = mvbox_handle.take() {
-                    handle.await;
-                }
-                if let Some(handle) = sentbox_handle.take() {
-                    handle.await;
-                }
-                if let Some(handle) = smtp_handle.take() {
-                    handle.await;
-                }
+                inbox_handle.take().expect("inbox not started").await;
+                mvbox_handle.take().expect("mvbox not started").await;
+                sentbox_handle.take().expect("sentbox not started").await;
+                smtp_handle.take().expect("smtp not started").await;

                *self = Scheduler::Stopped;
            }
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -114,7 +114,7 @@ pub async fn dc_get_securejoin_qr(context: &Context, group_chat_id: ChatId) -> O

            Some(format!(
                "OPENPGP4FPR:{}#a={}&g={}&x={}&i={}&s={}",
-                fingerprint.hex(),
+                fingerprint,
                self_addr_urlencoded,
                &group_name_urlencoded,
                &chat.grpid,
@@ -129,11 +129,7 @@ pub async fn dc_get_securejoin_qr(context: &Context, group_chat_id: ChatId) -> O
        // parameters used: a=n=i=s=
        Some(format!(
            "OPENPGP4FPR:{}#a={}&n={}&i={}&s={}",
-            fingerprint.hex(),
-            self_addr_urlencoded,
-            self_name_urlencoded,
-            &invitenumber,
-            &auth,
+            fingerprint, self_addr_urlencoded, self_name_urlencoded, &invitenumber, &auth,
        ))
    };

--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -1,7 +1,5 @@
 //! # SMTP transport module

-#![forbid(clippy::indexing_slicing)]
-
 pub mod send;

 use std::time::{Duration, Instant};
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -13,7 +13,6 @@ use crate::chat::{update_device_icon, update_saved_messages_icon};
 use crate::constants::{ShowEmails, DC_CHAT_ID_TRASH};
 use crate::context::Context;
 use crate::dc_tools::*;
-use crate::ephemeral::start_ephemeral_timers;
 use crate::param::*;
 use crate::peerstate::*;

@@ -569,17 +568,10 @@ pub async fn housekeeping(context: &Context) {
        }
    }

-    if let Err(err) = start_ephemeral_timers(context).await {
-        warn!(
-            context,
-            "Housekeeping: cannot start ephemeral timers: {}", err
-        );
-    }
-
    if let Err(err) = prune_tombstones(context).await {
        warn!(
            context,
-            "Housekeeping: Cannot prune message tombstones: {}", err
+            "Houskeeping: Cannot prune message tombstones: {}", err
        );
    }

@@ -601,7 +593,7 @@ fn is_file_in_use(files_in_use: &HashSet<String>, namespc_opt: Option<&str>, nam
 }

 fn maybe_add_file(files_in_use: &mut HashSet<String>, file: impl AsRef<str>) {
-    if !file.as_ref().starts_with("$BLOBDIR/") {
+    if !file.as_ref().starts_with("$BLOBDIR") {
        return;
    }

@@ -1258,32 +1250,6 @@ async fn open(
            .await?;
            sql.set_raw_config_int(context, "dbversion", 64).await?;
        }
-        if dbversion < 65 {
-            info!(context, "[migration] v65");
-            sql.execute(
-                "ALTER TABLE chats ADD COLUMN ephemeral_timer INTEGER",
-                paramsv![],
-            )
-            .await?;
-            // Timer value in seconds. For incoming messages this
-            // timer starts when message is read, so we want to have
-            // the value stored here until the timer starts.
-            sql.execute(
-                "ALTER TABLE msgs ADD COLUMN ephemeral_timer INTEGER DEFAULT 0",
-                paramsv![],
-            )
-            .await?;
-            // Timestamp indicating when the message should be
-            // deleted. It is convenient to store it here because UI
-            // needs this value to display how much time is left until
-            // the message is deleted.
-            sql.execute(
-                "ALTER TABLE msgs ADD COLUMN ephemeral_timestamp INTEGER DEFAULT 0",
-                paramsv![],
-            )
-            .await?;
-            sql.set_raw_config_int(context, "dbversion", 65).await?;
-        }

        // (2) updates that require high-level objects
        // (the structure is complete now and all objects are usable)
@@ -1346,12 +1312,10 @@ mod test {
        maybe_add_file(&mut files, "$BLOBDIR/hello");
        maybe_add_file(&mut files, "$BLOBDIR/world.txt");
        maybe_add_file(&mut files, "world2.txt");
-        maybe_add_file(&mut files, "$BLOBDIR");

        assert!(files.contains("hello"));
        assert!(files.contains("world.txt"));
        assert!(!files.contains("world2.txt"));
-        assert!(!files.contains("$BLOBDIR"));
    }

    #[test]
--- a/src/stock.rs
+++ b/src/stock.rs
@@ -177,7 +177,7 @@ pub enum StockMessage {
                    however, of course, if they like, you may point them to 👉 https://get.delta.chat"))]
    WelcomeMessage = 71,

-    #[strum(props(fallback = "Unknown sender for this chat. See 'info' for more details."))]
+    #[strum(props(fallback = "Unknown Sender for this chat. See 'info' for more details."))]
    UnknownSenderForChat = 72,

    #[strum(props(fallback = "Message from %1$s"))]
@@ -185,29 +185,6 @@ pub enum StockMessage {

    #[strum(props(fallback = "Failed to send message to %1$s."))]
    FailedSendingTo = 74,
-
-    #[strum(props(fallback = "Message deletion timer is disabled."))]
-    MsgEphemeralTimerDisabled = 75,
-
-    // A fallback message for unknown timer values.
-    // "s" stands for "second" SI unit here.
-    #[strum(props(fallback = "Message deletion timer is set to %1$s s."))]
-    MsgEphemeralTimerEnabled = 76,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 minute."))]
-    MsgEphemeralTimerMinute = 77,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 hour."))]
-    MsgEphemeralTimerHour = 78,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 day."))]
-    MsgEphemeralTimerDay = 79,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 week."))]
-    MsgEphemeralTimerWeek = 80,
-
-    #[strum(props(fallback = "Message deletion timer is set to 4 weeks."))]
-    MsgEphemeralTimerFourWeeks = 81,
 }

 /*
@@ -357,10 +334,10 @@ impl Context {
        let action1 = action.trim_end_matches('.');
        match from_id {
            0 => action,
-            DC_CONTACT_ID_SELF => {
+            1 => {
                self.stock_string_repl_str(StockMessage::MsgActionByMe, action1)
                    .await
-            }
+            } // DC_CONTACT_ID_SELF
            _ => {
                let displayname = Contact::get_by_id(self, from_id)
                    .await
@@ -432,7 +409,7 @@ mod tests {

    #[async_std::test]
    async fn test_set_stock_translation() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx
            .set_stock_translation(StockMessage::NoMessages, "xyz".to_string())
            .await
@@ -442,7 +419,7 @@ mod tests {

    #[async_std::test]
    async fn test_set_stock_translation_wrong_replacements() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        assert!(t
            .ctx
            .set_stock_translation(StockMessage::NoMessages, "xyz %1$s ".to_string())
@@ -457,7 +434,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_str() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        assert_eq!(
            t.ctx.stock_str(StockMessage::NoMessages).await,
            "No messages."
@@ -466,7 +443,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_string_repl_str() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        // uses %1$s substitution
        assert_eq!(
            t.ctx
@@ -479,7 +456,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_string_repl_int() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        assert_eq!(
            t.ctx
                .stock_string_repl_int(StockMessage::MsgAddMember, 42)
@@ -490,7 +467,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_string_repl_str2() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        assert_eq!(
            t.ctx
                .stock_string_repl_str2(StockMessage::ServerResponse, "foo", "bar")
@@ -501,7 +478,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_system_msg_simple() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        assert_eq!(
            t.ctx
                .stock_system_msg(StockMessage::MsgLocationEnabled, "", "", 0)
@@ -512,7 +489,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_system_msg_add_member_by_me() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        assert_eq!(
            t.ctx
                .stock_system_msg(
@@ -528,7 +505,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_system_msg_add_member_by_me_with_displayname() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        Contact::create(&t.ctx, "Alice", "alice@example.com")
            .await
            .expect("failed to create contact");
@@ -547,7 +524,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_system_msg_add_member_by_other_with_displayname() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let contact_id = {
            Contact::create(&t.ctx, "Alice", "alice@example.com")
                .await
@@ -571,7 +548,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_system_msg_grp_name() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        assert_eq!(
            t.ctx
                .stock_system_msg(
@@ -587,7 +564,7 @@ mod tests {

    #[async_std::test]
    async fn test_stock_system_msg_grp_name_other() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        let id = Contact::create(&t.ctx, "Alice", "alice@example.com")
            .await
            .expect("failed to create contact");
@@ -602,7 +579,7 @@ mod tests {

    #[async_std::test]
    async fn test_update_device_chats() {
-        let t = TestContext::new().await;
+        let t = dummy_context().await;
        t.ctx.update_device_chats().await.ok();
        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
        assert_eq!(chats.len(), 2);
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -18,59 +18,44 @@ pub(crate) struct TestContext {
    pub dir: TempDir,
 }

-impl TestContext {
-    /// Create a new [TestContext].
-    ///
-    /// The [Context] will be created and have an SQLite database named "db.sqlite" in the
-    /// [TestContext.dir] directory.  This directory is cleaned up when the [TestContext] is
-    /// dropped.
-    ///
-    /// [Context]: crate::context::Context
-    pub async fn new() -> Self {
-        let dir = tempdir().unwrap();
-        let dbfile = dir.path().join("db.sqlite");
-        let ctx = Context::new("FakeOS".into(), dbfile.into()).await.unwrap();
-        Self { ctx, dir }
-    }
+/// Create a new, opened [TestContext] using given callback.
+///
+/// The [Context] will be opened with the SQLite database named
+/// "db.sqlite" in the [TestContext.dir] directory.
+///
+/// [Context]: crate::context::Context
+pub(crate) async fn test_context() -> TestContext {
+    let dir = tempdir().unwrap();
+    let dbfile = dir.path().join("db.sqlite");
+    let ctx = Context::new("FakeOs".into(), dbfile.into()).await.unwrap();
+    TestContext { ctx, dir }
+}

-    /// Create a new configured [TestContext].
-    ///
-    /// This is a shortcut which automatically calls [TestContext::configure_alice] after
-    /// creating the context.
-    pub async fn new_alice() -> Self {
-        let t = Self::new().await;
-        t.configure_alice().await;
-        t
-    }
+/// Return a dummy [TestContext].
+///
+/// The context will be opened and use the SQLite database as
+/// specified in [test_context] but there is no callback hooked up,
+/// i.e. [Context::call_cb] will always return `0`.
+pub(crate) async fn dummy_context() -> TestContext {
+    test_context().await
+}

-    /// Configure with alice@example.com.
-    ///
-    /// The context will be fake-configured as the alice user, with a pre-generated secret
-    /// key.  The email address of the user is returned as a string.
-    pub async fn configure_alice(&self) -> String {
-        let keypair = alice_keypair();
-        self.configure_addr(&keypair.addr.to_string()).await;
-        key::store_self_keypair(&self.ctx, &keypair, key::KeyPairUse::Default)
-            .await
-            .expect("Failed to save Alice's key");
-        keypair.addr.to_string()
-    }
+pub(crate) async fn configured_offline_context() -> TestContext {
+    configured_offline_context_with_addr("alice@example.org").await
+}

-    /// Configure as a given email address.
-    ///
-    /// The context will be configured but the key will not be pre-generated so if a key is
-    /// used the fingerprint will be different every time.
-    pub async fn configure_addr(&self, addr: &str) {
-        self.ctx.set_config(Config::Addr, Some(addr)).await.unwrap();
-        self.ctx
-            .set_config(Config::ConfiguredAddr, Some(addr))
-            .await
-            .unwrap();
-        self.ctx
-            .set_config(Config::Configured, Some("1"))
-            .await
-            .unwrap();
-    }
+pub(crate) async fn configured_offline_context_with_addr(addr: &str) -> TestContext {
+    let t = dummy_context().await;
+    t.ctx.set_config(Config::Addr, Some(addr)).await.unwrap();
+    t.ctx
+        .set_config(Config::ConfiguredAddr, Some(addr))
+        .await
+        .unwrap();
+    t.ctx
+        .set_config(Config::Configured, Some("1"))
+        .await
+        .unwrap();
+    t
 }

 /// Load a pre-generated keypair for alice@example.com from disk.
@@ -93,6 +78,20 @@ pub(crate) fn alice_keypair() -> key::KeyPair {
    }
 }

+/// Creates Alice with a pre-generated keypair.
+///
+/// Returns the address of the keypair created (alice@example.com).
+pub(crate) async fn configure_alice_keypair(ctx: &Context) -> String {
+    let keypair = alice_keypair();
+    ctx.set_config(Config::ConfiguredAddr, Some(&keypair.addr.to_string()))
+        .await
+        .unwrap();
+    key::store_self_keypair(&ctx, &keypair, key::KeyPairUse::Default)
+        .await
+        .expect("Failed to save Alice's key");
+    keypair.addr.to_string()
+}
+
 /// Load a pre-generated keypair for bob@example.net from disk.
 ///
 /// Like [alice_keypair] but a different key and identity.
Author	SHA1	Message	Date
holger krekel	3e05015028	remove all mentioning of clippy and checks	2020-06-17 18:53:09 +02:00
holger krekel	6aa0291dfe	remove one more	2020-06-17 18:14:05 +02:00
holger krekel	bb9112811a	and another one bites	2020-06-17 17:48:43 +02:00
holger krekel	9574c09613	another try	2020-06-17 17:04:49 +02:00
holger krekel	486c9f6655	another try	2020-06-17 16:28:38 +02:00
holger krekel	65aec0c965	try a different way	2020-06-17 16:24:32 +02:00
holger krekel	e0750a04e8	try fix #1623 the wrong warnings	2020-06-17 16:09:07 +02:00