fix

Fix rename
Add API versioning to the JSON-RPC API
2026-04-11 10:02:09 +03:00 · 2022-07-15 16:24:04 +02:00 · 2022-07-15 15:49:42 +02:00 · 2022-07-15 14:51:28 +02:00 · 2022-07-15 13:48:32 +02:00 · 2022-07-09 17:30:55 +02:00
74 changed files with 1209 additions and 2436 deletions
--- a/.github/mergeable.yml
+++ b/.github/mergeable.yml
@@ -16,7 +16,7 @@ mergeable:
                required: ['CHANGELOG.md']
            - do: dependent
              changed:
-                file: 'deltachat-ffi/src/**'
+                file: 'deltachat-ffi/**'
                required: ['CHANGELOG.md']
    fail:
      - do: checks
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
      - uses: actions-rs/clippy-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --tests --examples --benches --features repl -- -D warnings
+          args: --workspace --tests --examples --benches

  docs:
    name: Rust doc comments
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,76 +12,18 @@
 - node: json rpc methods #3463:
 - `AccountManager.prototype.startJsonRpcHandler(callback: ((response: string) => void)): void`
 - `AccountManager.prototype.jsonRpcRequest(message: string): void`
- remove `dc_chat_get_info_json()` #3523
-
-### Added
- added a JSON RPC API, accessible through a WebSocket server, the CFFI bindings and the Node.js bindings #3463
-
-### Changes
- refactorings #3545 #3551
- use [pathlib](https://docs.python.org/3/library/pathlib.html) in provider update script #3543
-
-### Fixes
- improved error handling for account setup from qrcode #3474
-
-## 1.92.0
-
-### API-Changes
- add `dc_chat_get_mailinglist_addr()` #3520
-
-
-## 1.91.0
-
-### Added
- python bindings: extra method to get an account running
-
-### Changes
- refactorings #3437
-
-### Fixes
- mark "group image changed" as system message on receiver side #3517
-
-
-## 1.90.0
-
-### Changes
- handle drafts from mailto links in scanned QR #3492
- do not overflow ratelimiter leaky bucket #3496
- (AEAP) Add device message after you changed your address #3505
- (AEAP) Revert #3491, instead only replace contacts in verified groups #3510
- improve python bindings and tests #3502 #3503
-
-### Fixes
- don't squash text parts of NDN into attachments #3497
- do not treat non-failed DSNs as NDNs #3506
-
-
-## 1.89.0
-
-### Changes
-
- (AEAP) When one of your contacts changed their address, they are
-  only replaced in the chat where you got a message from them
-  for now #3491
-
-### Fixes
- replace musl libc name resolution errors with a better message #3485
- handle updates for not yet downloaded webxdc instances #3487
-
-
-## 1.88.0

 ### Changes
 - Implemented "Automatic e-mail address Porting" (AEAP). You can
  configure a new address in DC now, and when receivers get messages
  they will automatically recognize your moving to a new address. #3385
+- added a JSON RPC API, accessible through a WebSocket server, the CFFI bindings and the Node.js bindings #3463
 - switch from `async-std` to `tokio` as the async runtime #3449
 - upgrade to `pgp@0.8.0` #3467
 - add IMAP ID extension support #3468
 - configure DeltaChat folder by selecting it, so it is configured even if not LISTed #3371
 - build PyPy wheels #6683
 - improve default error if NDN does not provide an error #3456
- increase ratelimit from 3 to 6 messages per 60 seconds #3481

 ### Fixes
 - mailing list: remove square-brackets only for first name #3452
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -78,9 +78,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.59"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9"
+checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"

 [[package]]
 name = "ascii_utils"
@@ -275,9 +275,9 @@ dependencies = [

 [[package]]
 name = "backtrace"
-version = "0.3.66"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
+checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
 dependencies = [
 "addr2line",
 "cc",
@@ -447,12 +447,6 @@ dependencies = [
 "rustc_version",
 ]

-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
 [[package]]
 name = "cast5"
 version = "0.10.0"
@@ -623,12 +617,12 @@ dependencies = [

 [[package]]
 name = "criterion"
-version = "0.3.6"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
+checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
 dependencies = [
 "atty",
- "cast 0.3.0",
+ "cast",
 "clap",
 "criterion-plot",
 "csv",
@@ -655,7 +649,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
 dependencies = [
- "cast 0.2.7",
+ "cast",
 "itertools",
 ]

@@ -891,7 +885,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.92.0"
+version = "1.87.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -991,7 +985,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.92.0"
+version = "1.87.0"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1827,15 +1821,16 @@ dependencies = [

 [[package]]
 name = "image"
-version = "0.24.3"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964"
+checksum = "28edd9d7bc256be2502e325ac0628bde30b7001b9b52e0abe31a1a9dc2701212"
 dependencies = [
 "bytemuck",
 "byteorder",
 "color_quant",
 "gif",
 "jpeg-decoder",
+ "num-iter",
 "num-rational",
 "num-traits",
 "png",
@@ -2164,13 +2159,15 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.24.2"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
 dependencies = [
 "bitflags",
+ "cc",
 "cfg-if",
 "libc",
+ "memoffset",
 ]

 [[package]]
@@ -2276,18 +2273,18 @@ dependencies = [

 [[package]]
 name = "object"
-version = "0.29.0"
+version = "0.28.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
 dependencies = [
 "memchr",
 ]

 [[package]]
 name = "once_cell"
-version = "1.13.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"

 [[package]]
 name = "oorandom"
@@ -2335,9 +2332,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

 [[package]]
 name = "openssl-src"
-version = "111.22.0+1.1.1q"
+version = "111.21.0+1.1.1p"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
+checksum = "6d0a8313729211913936f1b95ca47a5fc7f2e04cd658c115388287f8a8361008"
 dependencies = [
 "cc",
 ]
@@ -2847,9 +2844,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -2864,9 +2861,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"

 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"

 [[package]]
 name = "remove_dir_all"
@@ -3013,9 +3010,9 @@ checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf"

 [[package]]
 name = "rustyline"
-version = "10.0.0"
+version = "9.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e"
+checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -3028,6 +3025,7 @@ dependencies = [
 "nix",
 "radix_trie",
 "scopeguard",
+ "smallvec",
 "unicode-segmentation",
 "unicode-width",
 "utf8parse",
@@ -3121,9 +3119,9 @@ checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"

 [[package]]
 name = "serde"
-version = "1.0.141"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7af873f2c95b99fcb0bd0fe622a43e29514658873c8ceba88c4cb88833a22500"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
 dependencies = [
 "serde_derive",
 ]
@@ -3140,9 +3138,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.141"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75743a150d003dd863b51dc809bcad0d73f2102c53632f1e954e738192a3413f"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3488,11 +3486,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.20.1"
+version = "1.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
 dependencies = [
- "autocfg",
 "bytes",
 "libc",
 "memchr",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.92.0"
+version = "1.87.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -36,7 +36,7 @@ encoded-words = "0.2"
 escaper = "0.1"
 futures = "0.3"
 hex = "0.4.0"
-image = { version = "0.24.3", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
@@ -46,7 +46,7 @@ native-tls = "0.2"
 num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.13.0"
+once_cell = "1.12.0"
 percent-encoding = "2.0"
 pgp = { version = "0.8", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
@@ -54,10 +54,10 @@ quick-xml = "0.23"
 r2d2 = "0.8"
 r2d2_sqlite = "0.20"
 rand = "0.8"
-regex = "1.6"
+regex = "1.5"
 rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustyline = { version = "10", optional = true }
+rustyline = { version = "9", optional = true }
 sanitize-filename = "0.4"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -83,7 +83,7 @@ async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "

 [dev-dependencies]
 ansi_term = "0.12.0"
-criterion = { version = "0.3.6", features = ["async_tokio"] }
+criterion = { version = "0.3.4", features = ["async_tokio"] }
 futures-lite = "1.12"
 log = "0.4"
 pretty_env_logger = "0.4"
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.92.0"
+version = "1.87.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -25,7 +25,7 @@ tokio = { version = "1", features = ["rt-multi-thread"] }
 anyhow = "1"
 thiserror = "1"
 rand = "0.7"
-once_cell = "1.13.0"
+once_cell = "1.12.0"

 [features]
 default = ["vendored"]
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -2292,7 +2292,7 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 * - DC_QR_FPR_MISMATCH with dc_lot_t::id=Contact ID:
 *   scanned fingerprint does not match last seen fingerprint.
 *
- * - DC_QR_FPR_WITHOUT_ADDR with dc_lot_t::text1=Formatted fingerprint
+ * - DC_QR_FPR_WITHOUT_ADDR with dc_lot_t::test1=Formatted fingerprint
 *   the scanned QR code contains a fingerprint but no e-mail address;
 *   suggest the user to establish an encrypted connection first.
 *
@@ -2305,8 +2305,7 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 *   if so, call dc_set_config_from_qr().
 *
 * - DC_QR_ADDR with dc_lot_t::id=Contact ID:
- *   e-mail address scanned, optionally, a draft message could be set in
- *   dc_lot_t::text1 in which case dc_lot_t::text1_meaning will be DC_TEXT1_DRAFT;
+ *   e-mail address scanned,
 *   ask the user if they want to start chatting;
 *   if so, call dc_create_chat_by_contact_id().
 *
@@ -3165,6 +3164,24 @@ dc_lot_t*        dc_chatlist_get_summary2    (dc_context_t* context, uint32_t ch
 dc_context_t*    dc_chatlist_get_context     (dc_chatlist_t* chatlist);


+/**
+ * Get info summary for a chat, in JSON format.
+ *
+ * The returned JSON string has the following key/values:
+ *
+ * id: chat id
+ * name: chat/group name
+ * color: color of this chat
+ * last-message-from: who sent the last message
+ * last-message-text: message (truncated)
+ * last-message-state: @ref DC_STATE constant
+ * last-message-date:
+ * avatar-path: path-to-blobfile
+ * is_verified: yes/no
+ * @return a UTF8-encoded JSON string containing all requested info. Must be freed using dc_str_unref(). NULL is never returned.
+ */
+char*            dc_chat_get_info_json       (dc_context_t* context, size_t chat_id);
+
 /**
 * @class dc_chat_t
 *
@@ -3239,19 +3256,6 @@ uint32_t        dc_chat_get_id               (const dc_chat_t* chat);
 int             dc_chat_get_type             (const dc_chat_t* chat);


-/**
- * Returns the address where messages are sent to if the chat is a mailing list.
- * If you just want to know if a mailing list can be written to,
- * use dc_chat_can_send() instead.
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return The mailing list address. Must be released using dc_str_unref() after usage.
- *     If there is no such address, an empty string is returned, NULL is never returned.
- */
-char*           dc_chat_get_mailinglist_addr (const dc_chat_t* chat);
-
-
 /**
 * Get name of a chat. For one-to-one chats, this is the name of the contact.
 * For group chats, this is the name given e.g. to dc_create_group_chat() or
@@ -6409,24 +6413,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used as status in the connectivity view.
 #define DC_STR_NOT_CONNECTED              121

-/// %1$s changed their address from %2$s to %3$s"
-///
-/// Used as an info message to chats with contacts that changed their address.
-#define DC_STR_AEAP_ADDR_CHANGED          122
-
-/// "You changed your email address from %1$s to %2$s.
-/// If you now send a message to a group, contacts there will automatically
-/// replace the old with your new address.\n\nIt's highly advised to set up 
-/// your old email provider to forward all emails to your new email address. 
-/// Otherwise you might miss messages of contacts who did not get your new 
-/// address yet." + the link to the AEAP blog post
-/// 
-/// As soon as there is a post about AEAP, the UIs should add it:
-/// set_stock_translation(123, getString(aeap_explanation) + "\n\n" + AEAP_BLOG_LINK)
-///
-/// Used in a device message that explains AEAP.
-#define DC_STR_AEAP_EXPLANATION_AND_LINK  123
-
 /**
 * @}
 */
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -2782,16 +2782,6 @@ pub unsafe extern "C" fn dc_chat_get_name(chat: *mut dc_chat_t) -> *mut libc::c_
    ffi_chat.chat.get_name().strdup()
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_get_mailinglist_addr(chat: *mut dc_chat_t) -> *mut libc::c_char {
-    if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_get_mailinglist_addr()");
-        return "".strdup();
-    }
-    let ffi_chat = &*chat;
-    ffi_chat.chat.get_mailinglist_addr().strdup()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut libc::c_char {
    if chat.is_null() {
@@ -2943,6 +2933,41 @@ pub unsafe extern "C" fn dc_chat_get_remaining_mute_duration(chat: *mut dc_chat_
    }
 }

+#[no_mangle]
+pub unsafe extern "C" fn dc_chat_get_info_json(
+    context: *mut dc_context_t,
+    chat_id: u32,
+) -> *mut libc::c_char {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_chat_get_info_json()");
+        return "".strdup();
+    }
+    let ctx = &*context;
+
+    block_on(async move {
+        let chat = match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
+            Ok(chat) => chat,
+            Err(err) => {
+                error!(ctx, "dc_get_chat_info_json() failed to load chat: {}", err);
+                return "".strdup();
+            }
+        };
+        let info = match chat.get_info(ctx).await {
+            Ok(info) => info,
+            Err(err) => {
+                error!(
+                    ctx,
+                    "dc_get_chat_info_json() failed to get chat info: {}", err
+                );
+                return "".strdup();
+            }
+        };
+        serde_json::to_string(&info)
+            .unwrap_or_log_default(ctx, "dc_get_chat_info_json() failed to serialise to json")
+            .strdup()
+    })
+}
+
 // dc_msg_t

 /// FFI struct for [dc_msg_t]
@@ -4417,28 +4442,40 @@ pub unsafe extern "C" fn dc_accounts_get_next_event(
 #[cfg(feature = "jsonrpc")]
 mod jsonrpc {
    use super::*;
-    use deltachat_jsonrpc::api::CommandApi;
+    use deltachat_jsonrpc::api::DeltaChatApiV0;
    use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};

    pub struct dc_jsonrpc_instance_t {
        receiver: OutReceiver,
-        handle: RpcSession<CommandApi>,
+        handle: RpcSession<DeltaChatApiV0>,
    }

    #[no_mangle]
    pub unsafe extern "C" fn dc_jsonrpc_init(
        account_manager: *mut dc_accounts_t,
+        api_version: *const libc::c_char,
    ) -> *mut dc_jsonrpc_instance_t {
        if account_manager.is_null() {
            eprintln!("ignoring careless call to dc_jsonrpc_init()");
            return ptr::null_mut();
        }
+        let api_version = to_string_lossy(api_version);

-        let cmd_api =
-            deltachat_jsonrpc::api::CommandApi::from_arc((*account_manager).inner.clone());
+        let rpc_api = match api_version.as_str() {
+            "v0" => {
+                deltachat_jsonrpc::api::DeltaChatApiV0::from_arc((*account_manager).inner.clone())
+            }
+            version => {
+                eprintln!(
+                    "Error initializing JSON-RPC API: API version {} is not supported.",
+                    version
+                );
+                return ptr::null_mut();
+            }
+        };

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

        let instance = dc_jsonrpc_instance_t { receiver, handle };

--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -51,7 +51,7 @@ impl Lot {
                Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
                Qr::Account { domain } => Some(domain),
                Qr::WebrtcInstance { domain, .. } => Some(domain),
-                Qr::Addr { draft, .. } => draft.as_deref(),
+                Qr::Addr { .. } => None,
                Qr::Url { url } => Some(url),
                Qr::Text { text } => Some(text),
                Qr::WithdrawVerifyContact { .. } => None,
@@ -79,13 +79,7 @@ impl Lot {
                Some(SummaryPrefix::Username(_username)) => Meaning::Text1Username,
                Some(SummaryPrefix::Me(_text)) => Meaning::Text1Self,
            },
-            Self::Qr(qr) => match qr {
-                Qr::Addr {
-                    draft: Some(_draft),
-                    ..
-                } => Meaning::Text1Draft,
-                _ => Meaning::None,
-            },
+            Self::Qr(_qr) => Meaning::None,
            Self::Error(_err) => Meaning::None,
        }
    }
@@ -124,7 +118,7 @@ impl Lot {
                Qr::FprWithoutAddr { .. } => Default::default(),
                Qr::Account { .. } => Default::default(),
                Qr::WebrtcInstance { .. } => Default::default(),
-                Qr::Addr { contact_id, .. } => contact_id.to_u32(),
+                Qr::Addr { contact_id } => contact_id.to_u32(),
                Qr::Url { .. } => Default::default(),
                Qr::Text { .. } => Default::default(),
                Qr::WithdrawVerifyContact { contact_id, .. } => contact_id.to_u32(),
--- a/deltachat-jsonrpc/src/api/mod.rs
+++ b/deltachat-jsonrpc/src/api/mod.rs
@@ -22,7 +22,6 @@ pub mod events;
 pub mod types;

 use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
-use crate::api::types::QrObject;

 use types::account::Account;
 use types::chat::FullChat;
@@ -35,20 +34,20 @@ use types::webxdc::WebxdcMessageInfo;
 use self::types::message::MessageViewtype;

 #[derive(Clone, Debug)]
-pub struct CommandApi {
+pub struct DeltaChatApiV0 {
    pub(crate) accounts: Arc<RwLock<Accounts>>,
 }

-impl CommandApi {
+impl DeltaChatApiV0 {
    pub fn new(accounts: Accounts) -> Self {
-        CommandApi {
+        DeltaChatApiV0 {
            accounts: Arc::new(RwLock::new(accounts)),
        }
    }

    #[allow(dead_code)]
    pub fn from_arc(accounts: Arc<RwLock<Accounts>>) -> Self {
-        CommandApi { accounts }
+        DeltaChatApiV0 { accounts }
    }

    async fn get_context(&self, id: u32) -> Result<deltachat::context::Context> {
@@ -64,7 +63,7 @@ impl CommandApi {
 }

 #[rpc(all_positional, ts_outdir = "typescript/generated")]
-impl CommandApi {
+impl DeltaChatApiV0 {
    // ---------------------------------------------
    //  Misc top level functions
    // ---------------------------------------------
@@ -203,13 +202,6 @@ impl CommandApi {
        qr::set_config_from_qr(&ctx, &qr_content).await
    }

-    async fn check_qr(&self, account_id: u32, qr_content: String) -> Result<QrObject> {
-        let ctx = self.get_context(account_id).await?;
-        let qr = qr::check_qr(&ctx, &qr_content).await?;
-        let qr_object = QrObject::from(qr);
-        Ok(qr_object)
-    }
-
    async fn get_config(&self, account_id: u32, key: String) -> Result<Option<String>> {
        let ctx = self.get_context(account_id).await?;
        get_config(&ctx, &key).await
--- a/deltachat-jsonrpc/src/api/types/mod.rs
+++ b/deltachat-jsonrpc/src/api/types/mod.rs
@@ -1,7 +1,3 @@
-use deltachat::qr::Qr;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
 pub mod account;
 pub mod chat;
 pub mod chat_list;
@@ -21,209 +17,3 @@ fn maybe_empty_string_to_option(string: String) -> Option<String> {
        Some(string)
    }
 }
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Qr", rename_all = "camelCase")]
-#[serde(tag = "type")]
-pub enum QrObject {
-    AskVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    AskVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    FprOk {
-        contact_id: u32,
-    },
-    FprMismatch {
-        contact_id: Option<u32>,
-    },
-    FprWithoutAddr {
-        fingerprint: String,
-    },
-    Account {
-        domain: String,
-    },
-    WebrtcInstance {
-        domain: String,
-        instance_pattern: String,
-    },
-    Addr {
-        contact_id: u32,
-        draft: Option<String>,
-    },
-    Url {
-        url: String,
-    },
-    Text {
-        text: String,
-    },
-    WithdrawVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    WithdrawVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-}
-
-impl From<Qr> for QrObject {
-    fn from(qr: Qr) -> Self {
-        match qr {
-            Qr::AskVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::AskVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::FprOk { contact_id } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::FprOk { contact_id }
-            }
-            Qr::FprMismatch { contact_id } => {
-                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
-                QrObject::FprMismatch { contact_id }
-            }
-            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
-            Qr::Account { domain } => QrObject::Account { domain },
-            Qr::WebrtcInstance {
-                domain,
-                instance_pattern,
-            } => QrObject::WebrtcInstance {
-                domain,
-                instance_pattern,
-            },
-            Qr::Addr { contact_id, draft } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::Addr { contact_id, draft }
-            }
-            Qr::Url { url } => QrObject::Url { url },
-            Qr::Text { text } => QrObject::Text { text },
-            Qr::WithdrawVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::WithdrawVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-        }
-    }
-}
--- a/deltachat-jsonrpc/src/lib.rs
+++ b/deltachat-jsonrpc/src/lib.rs
@@ -1,10 +1,11 @@
 pub mod api;
 pub use api::events;
+pub use api::{Accounts, DeltaChatApiV0};
 pub use yerpc;

 #[cfg(test)]
 mod tests {
-    use super::api::{Accounts, CommandApi};
+    use super::api::{Accounts, DeltaChatApiV0};
    use async_channel::unbounded;
    use futures::StreamExt;
    use tempfile::TempDir;
@@ -14,7 +15,7 @@ mod tests {
    async fn basic_json_rpc_functionality() -> anyhow::Result<()> {
        let tmp_dir = TempDir::new().unwrap().path().into();
        let accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
+        let api = DeltaChatApiV0::new(accounts);

        let (sender, mut receiver) = unbounded::<String>();

@@ -55,7 +56,7 @@ mod tests {
    async fn test_batch_set_config() -> anyhow::Result<()> {
        let tmp_dir = TempDir::new().unwrap().path().into();
        let accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
+        let api = DeltaChatApiV0::new(accounts);

        let (sender, mut receiver) = unbounded::<String>();

--- a/deltachat-jsonrpc/src/webserver.rs
+++ b/deltachat-jsonrpc/src/webserver.rs
@@ -6,7 +6,7 @@ use yerpc::{RpcClient, RpcSession};

 mod api;
 use api::events::event_to_json_rpc_notification;
-use api::{Accounts, CommandApi};
+use api::{Accounts, DeltaChatApiV0};

 const DEFAULT_PORT: u16 = 20808;

@@ -20,10 +20,10 @@ async fn main() -> Result<(), std::io::Error> {
        .unwrap_or(DEFAULT_PORT);
    log::info!("Starting with accounts directory `{path}`.");
    let accounts = Accounts::new(PathBuf::from(&path)).await.unwrap();
-    let state = CommandApi::new(accounts);
+    let state = DeltaChatApiV0::new(accounts);

    let app = Router::new()
-        .route("/ws", get(handler))
+        .route("/rpc/v0", get(handler))
        .layer(Extension(state.clone()));

    tokio::spawn(async move {
@@ -40,7 +40,7 @@ async fn main() -> Result<(), std::io::Error> {
    Ok(())
 }

-async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) -> Response {
+async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<DeltaChatApiV0>) -> Response {
    let (client, out_receiver) = RpcClient::new();
    let session = RpcSession::new(client.clone(), api.clone());
    tokio::spawn(async move {
--- a/deltachat-jsonrpc/typescript/generated/client.ts
+++ b/deltachat-jsonrpc/typescript/generated/client.ts
@@ -123,11 +123,6 @@ export class RawClient {
  }


-  public checkQr(accountId: T.U32, qrContent: string): Promise<T.Qr> {
-    return (this._transport.request('check_qr', [accountId, qrContent] as RPC.Params)) as Promise<T.Qr>;
-  }
-
-
  public getConfig(accountId: T.U32, key: string): Promise<(string|null)> {
    return (this._transport.request('get_config', [accountId, key] as RPC.Params)) as Promise<(string|null)>;
  }
--- a/deltachat-jsonrpc/typescript/generated/types.ts
+++ b/deltachat-jsonrpc/typescript/generated/types.ts
@@ -1,385 +1,97 @@
 // AUTO-GENERATED by typescript-type-def

-export type U32 = number;
-export type Account =
-  | ({ type: "Configured" } & {
-      id: U32;
-      displayName: string | null;
-      addr: string | null;
-      profileImage: string | null;
-      color: string;
-    })
-  | ({ type: "Unconfigured" } & { id: U32 });
-export type ProviderInfo = {
-  beforeLoginHint: string;
-  overviewPage: string;
-  status: U32;
-};
-export type Qr =
-  | ({ type: "askVerifyContact" } & {
-      contact_id: U32;
-      fingerprint: string;
-      invitenumber: string;
-      authcode: string;
-    })
-  | ({ type: "askVerifyGroup" } & {
-      grpname: string;
-      grpid: string;
-      contact_id: U32;
-      fingerprint: string;
-      invitenumber: string;
-      authcode: string;
-    })
-  | ({ type: "fprOk" } & { contact_id: U32 })
-  | ({ type: "fprMismatch" } & { contact_id: U32 | null })
-  | ({ type: "fprWithoutAddr" } & { fingerprint: string })
-  | ({ type: "account" } & { domain: string })
-  | ({ type: "webrtcInstance" } & { domain: string; instance_pattern: string })
-  | ({ type: "addr" } & { contact_id: U32 })
-  | ({ type: "url" } & { url: string })
-  | ({ type: "text" } & { text: string })
-  | ({ type: "withdrawVerifyContact" } & {
-      contact_id: U32;
-      fingerprint: string;
-      invitenumber: string;
-      authcode: string;
-    })
-  | ({ type: "withdrawVerifyGroup" } & {
-      grpname: string;
-      grpid: string;
-      contact_id: U32;
-      fingerprint: string;
-      invitenumber: string;
-      authcode: string;
-    })
-  | ({ type: "reviveVerifyContact" } & {
-      contact_id: U32;
-      fingerprint: string;
-      invitenumber: string;
-      authcode: string;
-    })
-  | ({ type: "reviveVerifyGroup" } & {
-      grpname: string;
-      grpid: string;
-      contact_id: U32;
-      fingerprint: string;
-      invitenumber: string;
-      authcode: string;
-    });
-export type Usize = number;
-export type ChatListEntry = [U32, U32];
-export type I64 = number;
-export type ChatListItemFetchResult =
-  | ({ type: "ChatListItem" } & {
-      id: U32;
-      name: string;
-      avatarPath: string | null;
-      color: string;
-      lastUpdated: I64 | null;
-      summaryText1: string;
-      summaryText2: string;
-      summaryStatus: U32;
-      isProtected: boolean;
-      isGroup: boolean;
-      freshMessageCounter: Usize;
-      isSelfTalk: boolean;
-      isDeviceTalk: boolean;
-      isSendingLocation: boolean;
-      isSelfInGroup: boolean;
-      isArchived: boolean;
-      isPinned: boolean;
-      isMuted: boolean;
-      isContactRequest: boolean;
-      /**
-       * contact id if this is a dm chat (for view profile entry in context menu)
-       */
-      dmChatContact: U32 | null;
-    })
-  | { type: "ArchiveLink" }
-  | ({ type: "Error" } & { id: U32; error: string });
-export type Contact = {
-  address: string;
-  color: string;
-  authName: string;
-  status: string;
-  displayName: string;
-  id: U32;
-  name: string;
-  profileImage: string | null;
-  nameAndAddr: string;
-  isBlocked: boolean;
-  isVerified: boolean;
-};
-export type FullChat = {
-  id: U32;
-  name: string;
-  isProtected: boolean;
-  profileImage: string | null;
-  archived: boolean;
-  chatType: U32;
-  isUnpromoted: boolean;
-  isSelfTalk: boolean;
-  contacts: Contact[];
-  contactIds: U32[];
-  color: string;
-  freshMessageCounter: Usize;
-  isContactRequest: boolean;
-  isDeviceChat: boolean;
-  selfInGroup: boolean;
-  isMuted: boolean;
-  ephemeralTimer: U32;
-  canSend: boolean;
-};
-export type Viewtype =
-  | "Unknown"
-  /**
-   * Text message.
-   */
-  | "Text"
-  /**
-   * Image message.
-   * If the image is an animated GIF, the type `Viewtype.Gif` should be used.
-   */
-  | "Image"
-  /**
-   * Animated GIF message.
-   */
-  | "Gif"
-  /**
-   * Message containing a sticker, similar to image.
-   * If possible, the ui should display the image without borders in a transparent way.
-   * A click on a sticker will offer to install the sticker set in some future.
-   */
-  | "Sticker"
-  /**
-   * Message containing an Audio file.
-   */
-  | "Audio"
-  /**
-   * A voice message that was directly recorded by the user.
-   * For all other audio messages, the type `Viewtype.Audio` should be used.
-   */
-  | "Voice"
-  /**
-   * Video messages.
-   */
-  | "Video"
-  /**
-   * Message containing any file, eg. a PDF.
-   */
-  | "File"
-  /**
-   * Message is an invitation to a videochat.
-   */
-  | "VideochatInvitation"
-  /**
-   * Message is an webxdc instance.
-   */
-  | "Webxdc";
-export type I32 = number;
-export type U64 = number;
-export type Message = {
-  id: U32;
-  chatId: U32;
-  fromId: U32;
-  quotedText: string | null;
-  quotedMessageId: U32 | null;
-  text: string | null;
-  hasLocation: boolean;
-  hasHtml: boolean;
-  viewType: Viewtype;
-  state: U32;
-  timestamp: I64;
-  sortTimestamp: I64;
-  receivedTimestamp: I64;
-  hasDeviatingTimestamp: boolean;
-  subject: string;
-  showPadlock: boolean;
-  isSetupmessage: boolean;
-  isInfo: boolean;
-  isForwarded: boolean;
-  duration: I32;
-  dimensionsHeight: I32;
-  dimensionsWidth: I32;
-  videochatType: U32 | null;
-  videochatUrl: string | null;
-  overrideSenderName: string | null;
-  sender: Contact;
-  setupCodeBegin: string | null;
-  file: string | null;
-  fileMime: string | null;
-  fileBytes: U64;
-  fileName: string | null;
-};
-export type WebxdcMessageInfo = {
-  /**
-   * The name of the app.
-   *
-   * Defaults to the filename if not set in the manifest.
-   */
-  name: string;
-  /**
-   * App icon file name.
-   * Defaults to an standard icon if nothing is set in the manifest.
-   *
-   * To get the file, use dc_msg_get_webxdc_blob(). (not yet in jsonrpc, use rust api or cffi for it)
-   *
-   * App icons should should be square,
-   * the implementations will add round corners etc. as needed.
-   */
-  icon: string;
-  /**
-   * if the Webxdc represents a document, then this is the name of the document
-   */
-  document: string | null;
-  /**
-   * short string describing the state of the app,
-   * sth. as "2 votes", "Highscore: 123",
-   * can be changed by the apps
-   */
-  summary: string | null;
-  /**
-   * URL where the source code of the Webxdc and other information can be found;
-   * defaults to an empty string.
-   * Implementations may offer an menu or a button to open this URL.
-   */
-  sourceCodeUrl: string | null;
-};
-export type __AllTyps = [
-  string,
-  boolean,
-  Record<string, string>,
-  U32,
-  U32,
-  null,
-  U32[],
-  U32,
-  null,
-  U32 | null,
-  Account[],
-  U32,
-  Account,
-  U32,
-  string,
-  ProviderInfo | null,
-  U32,
-  boolean,
-  U32,
-  Record<string, string>,
-  U32,
-  string,
-  string | null,
-  null,
-  U32,
-  Record<string, string | null>,
-  null,
-  U32,
-  string,
-  null,
-  U32,
-  string,
-  Qr,
-  U32,
-  string,
-  string | null,
-  U32,
-  string[],
-  Record<string, string | null>,
-  U32,
-  null,
-  U32,
-  null,
-  U32,
-  U32[],
-  U32,
-  U32,
-  Usize,
-  U32,
-  string,
-  U32,
-  U32,
-  string,
-  null,
-  U32,
-  U32 | null,
-  string | null,
-  U32 | null,
-  ChatListEntry[],
-  U32,
-  ChatListEntry[],
-  Record<U32, ChatListItemFetchResult>,
-  U32,
-  U32,
-  FullChat,
-  U32,
-  U32,
-  null,
-  U32,
-  U32,
-  null,
-  U32,
-  string,
-  string,
-  U32,
-  U32,
-  U32,
-  U32,
-  U32[],
-  U32,
-  U32,
-  Message,
-  U32,
-  U32[],
-  Record<U32, Message>,
-  U32,
-  U32,
-  Contact,
-  U32,
-  string,
-  string | null,
-  U32,
-  U32,
-  U32,
-  U32,
-  U32,
-  U32,
-  null,
-  U32,
-  U32,
-  null,
-  U32,
-  Contact[],
-  U32,
-  U32,
-  string | null,
-  U32[],
-  U32,
-  U32,
-  string | null,
-  Contact[],
-  U32,
-  U32[],
-  Record<U32, Contact>,
-  U32,
-  U32,
-  Viewtype,
-  Viewtype | null,
-  Viewtype | null,
-  U32[],
-  U32,
-  U32,
-  string,
-  string,
-  null,
-  U32,
-  U32,
-  U32,
-  string,
-  U32,
-  U32,
-  WebxdcMessageInfo,
-  U32,
-  string,
-  U32,
-  U32
-];
+export type U32=number;
+export type Account=(({"type":"Configured";}&{"id":U32;"displayName":(string|null);"addr":(string|null);"profileImage":(string|null);"color":string;})|({"type":"Unconfigured";}&{"id":U32;}));
+export type ProviderInfo={"beforeLoginHint":string;"overviewPage":string;"status":U32;};
+export type Usize=number;
+export type ChatListEntry=[U32,U32];
+export type I64=number;
+export type ChatListItemFetchResult=(({"type":"ChatListItem";}&{"id":U32;"name":string;"avatarPath":(string|null);"color":string;"lastUpdated":(I64|null);"summaryText1":string;"summaryText2":string;"summaryStatus":U32;"isProtected":boolean;"isGroup":boolean;"freshMessageCounter":Usize;"isSelfTalk":boolean;"isDeviceTalk":boolean;"isSendingLocation":boolean;"isSelfInGroup":boolean;"isArchived":boolean;"isPinned":boolean;"isMuted":boolean;"isContactRequest":boolean;
+/**
+ * contact id if this is a dm chat (for view profile entry in context menu)
+ */
+"dmChatContact":(U32|null);})|{"type":"ArchiveLink";}|({"type":"Error";}&{"id":U32;"error":string;}));
+export type Contact={"address":string;"color":string;"authName":string;"status":string;"displayName":string;"id":U32;"name":string;"profileImage":(string|null);"nameAndAddr":string;"isBlocked":boolean;"isVerified":boolean;};
+export type FullChat={"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"contacts":(Contact)[];"contactIds":(U32)[];"color":string;"freshMessageCounter":Usize;"isContactRequest":boolean;"isDeviceChat":boolean;"selfInGroup":boolean;"isMuted":boolean;"ephemeralTimer":U32;"canSend":boolean;};
+export type Viewtype=("Unknown"|
+/**
+ * Text message.
+ */
+"Text"|
+/**
+ * Image message.
+ * If the image is an animated GIF, the type `Viewtype.Gif` should be used.
+ */
+"Image"|
+/**
+ * Animated GIF message.
+ */
+"Gif"|
+/**
+ * Message containing a sticker, similar to image.
+ * If possible, the ui should display the image without borders in a transparent way.
+ * A click on a sticker will offer to install the sticker set in some future.
+ */
+"Sticker"|
+/**
+ * Message containing an Audio file.
+ */
+"Audio"|
+/**
+ * A voice message that was directly recorded by the user.
+ * For all other audio messages, the type `Viewtype.Audio` should be used.
+ */
+"Voice"|
+/**
+ * Video messages.
+ */
+"Video"|
+/**
+ * Message containing any file, eg. a PDF.
+ */
+"File"|
+/**
+ * Message is an invitation to a videochat.
+ */
+"VideochatInvitation"|
+/**
+ * Message is an webxdc instance.
+ */
+"Webxdc");
+export type I32=number;
+export type U64=number;
+export type Message={"id":U32;"chatId":U32;"fromId":U32;"quotedText":(string|null);"quotedMessageId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);};
+export type WebxdcMessageInfo={
+/**
+ * The name of the app.
+ * 
+ * Defaults to the filename if not set in the manifest.
+ */
+"name":string;
+/**
+ * App icon file name.
+ * Defaults to an standard icon if nothing is set in the manifest.
+ * 
+ * To get the file, use dc_msg_get_webxdc_blob(). (not yet in jsonrpc, use rust api or cffi for it)
+ * 
+ * App icons should should be square,
+ * the implementations will add round corners etc. as needed.
+ */
+"icon":string;
+/**
+ * if the Webxdc represents a document, then this is the name of the document
+ */
+"document":(string|null);
+/**
+ * short string describing the state of the app,
+ * sth. as "2 votes", "Highscore: 123",
+ * can be changed by the apps
+ */
+"summary":(string|null);
+/**
+ * URL where the source code of the Webxdc and other information can be found;
+ * defaults to an empty string.
+ * Implementations may offer an menu or a button to open this URL.
+ */
+"sourceCodeUrl":(string|null);};
+export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],U32,Account,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,U32,null,U32,null,U32,(U32)[],U32,U32,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,null,U32,U32,null,U32,string,string,U32,U32,U32,U32,(U32)[],U32,U32,Message,U32,(U32)[],Record<U32,Message>,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,string,U32,U32];
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -1,4 +1,3 @@
-#![allow(clippy::format_push_string)]
 extern crate dirs;

 use std::path::Path;
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -23,6 +23,7 @@ use deltachat::securejoin::*;
 use deltachat::{EventType, Events};
 use log::{error, info, warn};
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
+use rustyline::config::OutputStreamType;
 use rustyline::error::ReadlineError;
 use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};
 use rustyline::hint::{Hinter, HistoryHinter};
@@ -313,6 +314,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
        .history_ignore_space(true)
        .completion_type(CompletionType::List)
        .edit_mode(EditMode::Emacs)
+        .output_stream(OutputStreamType::Stdout)
        .build();
    let mut selected_chat = ChatId::default();

@@ -323,7 +325,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
            highlighter: MatchingBracketHighlighter::new(),
            hinter: HistoryHinter {},
        };
-        let mut rl = Editor::with_config(config)?;
+        let mut rl = Editor::with_config(config);
        rl.set_helper(Some(h));
        rl.bind_sequence(KeyEvent::alt('N'), Cmd::HistorySearchForward);
        rl.bind_sequence(KeyEvent::alt('P'), Cmd::HistorySearchBackward);
--- a/node/README.md
+++ b/node/README.md
@@ -234,7 +234,7 @@ We have the following scripts for building, testing and coverage:
 The following steps are needed to make a release:

 1. Wait until `pack-module` github action is completed
-2. Run `npm publish https://download.delta.chat/node/deltachat-node-1.x.x.tar.gz` to publish it to npm. You probably need write rights to npm.
+2. Run `npm publish https://download.delta.chat/node/deltachat-node-v1.x.x.tar.gz` to publish it to npm. You probably need write rights to npm.

 ## License

--- a/node/lib/chat.ts
+++ b/node/lib/chat.ts
@@ -39,10 +39,6 @@ export class Chat {
    return binding.dcn_chat_get_name(this.dc_chat)
  }

-  getMailinglistAddr(): string {
-    return binding.dcn_chat_get_mailinglist_addr(this.dc_chat)
-  }
-
  getProfileImage(): string {
    return binding.dcn_chat_get_profile_image(this.dc_chat)
  }
@@ -96,7 +92,6 @@ export class Chat {
      color: this.color,
      id: this.getId(),
      name: this.getName(),
-      mailinglistAddr: this.getMailinglistAddr(),
      profileImage: this.getProfileImage(),
      type: this.getType(),
      isSelfTalk: this.isSelfTalk(),
--- a/node/lib/deltachat.ts
+++ b/node/lib/deltachat.ts
@@ -115,7 +115,7 @@ export class AccountManager extends EventEmitter {
    debug('Started event handler')
  }

-  startJsonRpcHandler(callback: ((response: string) => void) | null) {
+  startJsonRpcHandler(callback: ((response: string) => void) | null, apiVersion: string = "v0") {
    if (this.dcn_accounts === null) {
      throw new Error('dcn_account is null')
    }
@@ -126,7 +126,7 @@ export class AccountManager extends EventEmitter {
      throw new Error('jsonrpc was started already')
    }

-    binding.dcn_accounts_start_jsonrpc(this.dcn_accounts, callback.bind(this))
+    binding.dcn_accounts_start_jsonrpc(this.dcn_accounts, apiVersion, callback.bind(this))
    debug('Started JSON-RPC handler')
    this.jsonRpcStarted = true
  }
--- a/node/lib/types.ts
+++ b/node/lib/types.ts
@@ -12,7 +12,6 @@ export interface ChatJSON {
  color: string
  id: number
  name: string
-  mailinglistAddr: string
  profileImage: string
  type: number
  isSelfTalk: boolean
--- a/node/segfault.js
+++ b/node/segfault.js
@@ -0,0 +1,28 @@
+const { default: dc } = require('./dist')
+
+const ac = new dc('test1233490')
+
+console.log("[1]");
+
+ac.startJsonRpcHandler(console.log)
+
+console.log("[2]");
+console.log(
+  ac.jsonRpcRequest(
+    JSON.stringify({
+      jsonrpc: '2.0',
+      method: 'get_all_account_ids',
+      params: [],
+      id: 2,
+    })
+  )
+)
+
+console.log("[3]");
+
+setTimeout(() => {
+    console.log("[4]");
+  ac.close() // This segfaults -> TODO Findout why?
+
+  console.log('still living')
+}, 1000)
--- a/node/segfault2.js
+++ b/node/segfault2.js
@@ -0,0 +1,50 @@
+const { default: dc } = require('./dist')
+
+const ac = new dc('test1233490')
+
+console.log('[1]')
+
+ac.startJsonRpcHandler(console.log)
+
+console.log('[2]')
+console.log(
+  ac.jsonRpcRequest(
+    JSON.stringify({
+      jsonrpc: '2.0',
+      method: 'batch_set_config',
+      id: 3,
+      params: [
+        69,
+        {
+          addr: '',
+          mail_user: '',
+          mail_pw: '',
+          mail_server: '',
+          mail_port: '',
+          mail_security: '',
+          imap_certificate_checks: '',
+          send_user: '',
+          send_pw: '',
+          send_server: '',
+          send_port: '',
+          send_security: '',
+          smtp_certificate_checks: '',
+          socks5_enabled: '0',
+          socks5_host: '',
+          socks5_port: '',
+          socks5_user: '',
+          socks5_password: '',
+        },
+      ],
+    })
+  )
+)
+
+console.log('[3]')
+
+setTimeout(() => {
+  console.log('[4]')
+  ac.close() // This segfaults -> TODO Findout why?
+
+  console.log('still living')
+}, 1000)
--- a/node/src/module.c
+++ b/node/src/module.c
@@ -1628,18 +1628,6 @@ NAPI_METHOD(dcn_chat_get_name) {
  NAPI_RETURN_AND_UNREF_STRING(name);
 }

-NAPI_METHOD(dcn_chat_get_mailinglist_addr) {
-  NAPI_ARGV(1);
-  NAPI_DC_CHAT();
-
-  //TRACE("calling..");
-  char* addr = dc_chat_get_mailinglist_addr(dc_chat);
-  //TRACE("result %s", name);
-
-  NAPI_RETURN_AND_UNREF_STRING(addr);
-}
-
-
 NAPI_METHOD(dcn_chat_get_profile_image) {
  NAPI_ARGV(1);
  NAPI_DC_CHAT();
@@ -3325,9 +3313,10 @@ static void call_accounts_js_jsonrpc_handler(napi_env env, napi_value js_callbac
 }

 NAPI_METHOD(dcn_accounts_start_jsonrpc) {
-  NAPI_ARGV(2);
+  NAPI_ARGV(3);
  NAPI_DCN_ACCOUNTS();
-  napi_value callback = argv[1];
+  NAPI_ARGV_UTF8_MALLOC(api_version, 1);
+  napi_value callback = argv[2];

  TRACE("calling..");
  napi_value async_resource_name;
@@ -3350,7 +3339,7 @@ NAPI_METHOD(dcn_accounts_start_jsonrpc) {
  TRACE("done");

  dcn_accounts->gc = 0;
-  dcn_accounts->jsonrpc_instance = dc_jsonrpc_init(dcn_accounts->dc_accounts);
+  dcn_accounts->jsonrpc_instance = dc_jsonrpc_init(dcn_accounts->dc_accounts, api_version);

  TRACE("creating uv thread..");
  uv_thread_create(&dcn_accounts->jsonrpc_thread, accounts_jsonrpc_thread_func, dcn_accounts);
@@ -3507,7 +3496,6 @@ NAPI_INIT() {
  NAPI_EXPORT_FUNCTION(dcn_chat_get_visibility);
  NAPI_EXPORT_FUNCTION(dcn_chat_get_id);
  NAPI_EXPORT_FUNCTION(dcn_chat_get_name);
-  NAPI_EXPORT_FUNCTION(dcn_chat_get_mailinglist_addr);
  NAPI_EXPORT_FUNCTION(dcn_chat_get_profile_image);
  NAPI_EXPORT_FUNCTION(dcn_chat_get_type);
  NAPI_EXPORT_FUNCTION(dcn_chat_is_self_talk);
--- a/package.json
+++ b/package.json
@@ -61,5 +61,5 @@
    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.92.0"
+  "version": "1.87.0"
 }
--- a/python/README.rst
+++ b/python/README.rst
@@ -1,77 +1,84 @@
 =========================
-DeltaChat Python bindings
+deltachat python bindings
 =========================

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

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

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

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

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

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

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

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

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

 To verify it worked::

    python -c "import deltachat"

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

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

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

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

 .. _livetests:

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

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

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

    export DCC_NEW_TMP_EMAIL=<URL you got from us>

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

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

 Each test run creates new accounts.

+
 .. _sourceinstall:

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

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

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

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

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

-   python3 install_python_bindings.py
+   python install_python_bindings.py

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

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

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

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

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

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

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

    $ docker run -e DCC_NEW_TMP_EMAIL \
-       --rm -it -v $(pwd):/mnt -w /mnt \
+       --rm -it -v \$(pwd):/mnt -w /mnt \
       deltachat/coredeps scripts/run_all.sh
+
+
+Optionally build your own docker image
+--------------------------------------
+
+If you want to build your own custom docker image you can do this::
+
+   $ cd deltachat-core # cd to deltachat-core checkout directory
+   $ docker build -t deltachat/coredeps scripts/docker_coredeps
+
+This will use the ``scripts/docker_coredeps/Dockerfile`` to build
+up docker image called ``deltachat/coredeps``.  You can afterwards
+find it with::
+
+   $ docker images
+
+
+Troubleshooting
+---------------
+
+On more recent systems running the docker image may crash.  You can
+fix this by adding ``vsyscall=emulate`` to the Linux kernel boot
+arguments commandline.  E.g. on Debian you'd add this to
+``GRUB_CMDLINE_LINUX_DEFAULT`` in ``/etc/default/grub``.
--- a/python/fail_test.py
+++ b/python/fail_test.py
@@ -0,0 +1,7 @@
+from __future__ import print_function
+from deltachat import capi
+from deltachat.capi import ffi, lib
+
+if __name__ == "__main__":
+    ctx = capi.lib.dc_context_new(ffi.NULL, ffi.NULL)
+    lib.dc_stop_io(ctx)
--- a/python/install_python_bindings.py
+++ b/python/install_python_bindings.py
@@ -16,7 +16,7 @@ if __name__ == "__main__":
        dn = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
        os.environ["DCC_RS_DEV"] = dn

-    cmd = ["cargo", "build", "-p", "deltachat_ffi", "--features", "jsonrpc"]
+    cmd = ["cargo", "build", "-p", "deltachat_ffi"]

    if target == "release":
        os.environ["CARGO_PROFILE_RELEASE_LTO"] = "on"
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -1,41 +1,7 @@
 [build-system]
-requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", "cffi>=1.0.0", "pkgconfig"]
+requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2", "cffi>=1.0.0", "pkgconfig"]
 build-backend = "setuptools.build_meta"

-[project]
-name = "deltachat"
-description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
-readme = "README.rst"
-requires-python = ">=3.7"
-authors = [
-    { name = "holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors" },
-]
-classifiers = [
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-    "Programming Language :: Python :: 3",
-    "Topic :: Communications :: Email",
-    "Topic :: Software Development :: Libraries",
-]
-dependencies = [
-    "cffi>=1.0.0",
-    "imap-tools",
-    "pluggy",
-    "requests",
-]
-dynamic = [
-    "version"
-]
-
-[project.urls]
-"Home" = "https://github.com/deltachat/deltachat-core-rust/"
-"Bug Tracker" = "https://github.com/deltachat/deltachat-core-rust/issues"
-"Documentation" = "https://py.delta.chat/"
-
-[project.entry-points.pytest11]
-"deltachat.testplugin" = "deltachat.testplugin"
-
 [tool.setuptools_scm]
 root = ".."
 tag_regex = '^(?P<prefix>py-)?(?P<version>[^\+]+)(?P<suffix>.*)?$'
--- a/python/setup.py
+++ b/python/setup.py
@@ -1,4 +1,40 @@
-from setuptools import setup
+import os
+import re
+
+import setuptools
+
+
+def main():
+    with open("README.rst") as f:
+        long_description = f.read()
+    setuptools.setup(
+        name="deltachat",
+        description="Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat",
+        long_description=long_description,
+        author="holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors",
+        install_requires=["cffi>=1.0.0", "pluggy", "imap-tools", "requests"],
+        setup_requires=[
+            "setuptools_scm",  # required for compatibility with `python3 setup.py sdist`
+            "pkgconfig",
+        ],
+        packages=setuptools.find_packages("src"),
+        package_dir={"": "src"},
+        cffi_modules=["src/deltachat/_build.py:ffibuilder"],
+        entry_points={
+            "pytest11": [
+                "deltachat.testplugin = deltachat.testplugin",
+            ],
+        },
+        classifiers=[
+            "Development Status :: 4 - Beta",
+            "Intended Audience :: Developers",
+            "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+            "Programming Language :: Python :: 3",
+            "Topic :: Communications :: Email",
+            "Topic :: Software Development :: Libraries",
+        ],
+    )
+

 if __name__ == "__main__":
-    setup(cffi_modules=["src/deltachat/_build.py:ffibuilder"])
+    main()
--- a/python/src/deltachat/init.py
+++ b/python/src/deltachat/init.py
@@ -60,7 +60,29 @@ def run_cmdline(argv=None, account_plugins=None):

    ac = Account(args.db)

-    ac.run_account(addr=args.email, password=args.password, account_plugins=account_plugins, show_ffi=args.show_ffi)
+    if args.show_ffi:
+        ac.set_config("displayname", "bot")
+        log = events.FFIEventLogger(ac)
+        ac.add_account_plugin(log)
+
+    for plugin in account_plugins or []:
+        print("adding plugin", plugin)
+        ac.add_account_plugin(plugin)
+
+    if not ac.is_configured():
+        assert (
+            args.email and args.password
+        ), "you must specify --email and --password once to configure this database/account"
+        ac.set_config("addr", args.email)
+        ac.set_config("mail_pw", args.password)
+        ac.set_config("mvbox_move", "0")
+        ac.set_config("sentbox_watch", "0")
+        ac.set_config("bot", "1")
+        configtracker = ac.configure()
+        configtracker.wait_finish()
+
+    # start IO threads and configure if neccessary
+    ac.start_io()

    print("{}: waiting for message".format(ac.get_config("addr")))

--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -20,7 +20,7 @@ from .cutil import (
    from_optional_dc_charpointer,
    iter_array,
 )
-from .events import EventThread, FFIEventLogger
+from .events import EventThread
 from .message import Message
 from .tracker import ConfigureTracker, ImexTracker

@@ -169,6 +169,8 @@ class Account(object):
        """
        self._check_config_key(name)
        namebytes = name.encode("utf8")
+        if namebytes == b"addr" and self.is_configured():
+            raise ValueError("can not change 'addr' after account is configured.")
        if isinstance(value, (int, bool)):
            value = str(int(value))
        if value is not None:
@@ -596,36 +598,6 @@ class Account(object):
    # meta API for start/stop and event based processing
    #

-    def run_account(self, addr=None, password=None, account_plugins=None, show_ffi=False):
-        """get the account running, configure it if necessary. add plugins if provided.
-
-        :param addr: the email address of the account
-        :param password: the password of the account
-        :param account_plugins: a list of plugins to add
-        :param show_ffi: show low level ffi events
-        """
-        if show_ffi:
-            self.set_config("displayname", "bot")
-            log = FFIEventLogger(self)
-            self.add_account_plugin(log)
-
-        for plugin in account_plugins or []:
-            print("adding plugin", plugin)
-            self.add_account_plugin(plugin)
-
-        if not self.is_configured():
-            assert addr and password, "you must specify email and password once to configure this database/account"
-            self.set_config("addr", addr)
-            self.set_config("mail_pw", password)
-            self.set_config("mvbox_move", "0")
-            self.set_config("sentbox_watch", "0")
-            self.set_config("bot", "1")
-            configtracker = self.configure()
-            configtracker.wait_finish()
-
-        # start IO threads and configure if neccessary
-        self.start_io()
-
    def add_account_plugin(self, plugin, name=None):
        """add an account plugin which implements one or more of
        the :class:`deltachat.hookspec.PerAccount` hooks.
@@ -708,9 +680,8 @@ class Account(object):
        """Start configuration process and return a Configtracker instance
        on which you can block with wait_finish() to get a True/False success
        value for the configuration process.
-
-        :param reconfigure: deprecated, doesn't need to be checked anymore.
        """
+        assert self.is_configured() == reconfigure
        if not self.get_config("addr") or not self.get_config("mail_pw"):
            raise MissingCredentials("addr or mail_pwd not set in config")
        configtracker = ConfigureTracker(self)
--- a/python/src/deltachat/chat.py
+++ b/python/src/deltachat/chat.py
@@ -171,6 +171,12 @@ class Chat(object):
        """
        return lib.dc_chat_get_color(self._dc_chat)

+    def get_summary(self):
+        """return dictionary with summary information."""
+        dc_res = lib.dc_chat_get_info_json(self.account._dc_context, self.id)
+        s = from_dc_charpointer(dc_res)
+        return json.loads(s)
+
    def mute(self, duration: Optional[int] = None) -> None:
        """mutes the chat

--- a/python/tests/package_wheels.py
+++ b/python/tests/package_wheels.py
@@ -0,0 +1,13 @@
+import os
+import subprocess
+import sys
+
+if __name__ == "__main__":
+    assert len(sys.argv) == 2
+    wheelhousedir = sys.argv[1]
+    # pip wheel will build in an isolated tmp dir that does not have git
+    # history so setuptools_scm can not automatically determine a
+    # version there. So pass in the version through an env var.
+    version = subprocess.check_output(["python", "setup.py", "--version"]).strip().split(b"\n")[-1]
+    os.environ["SETUPTOOLS_SCM_PRETEND_VERSION"] = version.decode("ascii")
+    subprocess.check_call(("pip wheel . -w %s" % wheelhousedir).split())
--- a/python/tests/test_1_online.py
+++ b/python/tests/test_1_online.py
@@ -1581,9 +1581,8 @@ def test_set_get_group_image(acfactory, data, lp):

    lp.sec("ac2: wait for receiving message from ac1")
    msg1 = ac2._evtracker.wait_next_incoming_message()
-    assert msg1.is_system_message()  # Member added
    msg2 = ac2._evtracker.wait_next_incoming_message()
-    assert msg2.text == "hi"
+    assert msg1.text == "hi" or msg2.text == "hi"
    assert msg1.chat.id == msg2.chat.id

    lp.sec("ac2: see if chat now has got the profile image")
@@ -1597,8 +1596,6 @@ def test_set_get_group_image(acfactory, data, lp):
    lp.sec("ac2: delete profile image from chat")
    msg1.chat.remove_profile_image()
    msg_back = ac1._evtracker.wait_next_incoming_message()
-    assert msg_back.text == "Group image deleted by {}.".format(ac2.get_config("addr"))
-    assert msg_back.is_system_message()
    assert msg_back.chat == chat
    assert chat.get_profile_image() is None

@@ -1857,7 +1854,7 @@ def test_configure_error_msgs_invalid_server(acfactory):
    # Can't connect so it probably should say something about "internet"
    # again, should not repeat itself
    # If this fails then probably `e.msg.to_lowercase().contains("could not resolve")`
-    # in configure.rs returned false because the error message was changed
+    # in configure/mod.rs returned false because the error message was changed
    # (i.e. did not contain "could not resolve" anymore)
    assert (ev.data2.count("internet") + ev.data2.count("network")) == 1
    # Should mention that it can't connect:
@@ -2055,47 +2052,6 @@ def test_delete_deltachat_folder(acfactory):
    assert "DeltaChat" in ac1.direct_imap.list_folders()


-def test_aeap_flow_verified(acfactory, lp):
-    """Test that a new address is added to a contact when it changes its address."""
-    ac1, ac2, ac1new = acfactory.get_online_accounts(3)
-
-    lp.sec("ac1: create verified-group QR, ac2 scans and joins")
-    chat = ac1.create_group_chat("hello", verified=True)
-    assert chat.is_protected()
-    qr = chat.get_join_qr()
-    lp.sec("ac2: start QR-code based join-group protocol")
-    chat2 = ac2.qr_join_chat(qr)
-    assert chat2.id >= 10
-    ac1._evtracker.wait_securejoin_inviter_progress(1000)
-
-    lp.sec("sending first message")
-    msg_out = chat.send_text("old address")
-
-    lp.sec("receiving first message")
-    ac2._evtracker.wait_next_incoming_message()  # member added message
-    msg_in_1 = ac2._evtracker.wait_next_incoming_message()
-    assert msg_in_1.text == msg_out.text
-
-    lp.sec("changing email account")
-    ac1.set_config("addr", ac1new.get_config("addr"))
-    ac1.set_config("mail_pw", ac1new.get_config("mail_pw"))
-    ac1.stop_io()
-    configtracker = ac1.configure()
-    configtracker.wait_finish()
-    ac1.start_io()
-
-    lp.sec("sending second message")
-    msg_out = chat.send_text("changed address")
-
-    lp.sec("receiving second message")
-    msg_in_2 = ac2._evtracker.wait_next_incoming_message()
-    assert msg_in_2.text == msg_out.text
-    assert msg_in_2.chat.id == msg_in_1.chat.id
-    assert msg_in_2.get_sender_contact().addr == ac1new.get_config("addr")
-    assert len(msg_in_2.chat.get_contacts()) == 2
-    assert ac1new.get_config("addr") in [contact.addr for contact in msg_in_2.chat.get_contacts()]
-
-
 class TestOnlineConfigureFails:
    def test_invalid_password(self, acfactory):
        configdict = acfactory.get_next_liveconfig()
--- a/python/tests/test_3_offline.py
+++ b/python/tests/test_3_offline.py
@@ -497,6 +497,12 @@ class TestOfflineChat:
        contact = msg.get_sender_contact()
        assert contact == ac1.get_self_contact()

+    def test_set_config_after_configure_is_forbidden(self, ac1):
+        assert ac1.get_config("mail_pw")
+        assert ac1.is_configured()
+        with pytest.raises(ValueError):
+            ac1.set_config("addr", "123@example.org")
+
    def test_import_export_on_unencrypted_acct(self, acfactory, tmpdir):
        backupdir = tmpdir.mkdir("backup")
        ac1 = acfactory.get_pseudo_configured_account()
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -9,8 +9,9 @@ envlist =
 [testenv]
 commands = 
    pytest -n6 --extra-info --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
-    pip wheel . -w {toxworkdir}/wheelhouse --no-deps
+    python tests/package_wheels.py {toxworkdir}/wheelhouse
 passenv = 
+    TRAVIS 
    DCC_RS_DEV
    DCC_RS_TARGET
    DCC_NEW_TMP_EMAIL 
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -14,15 +14,18 @@ and an own build machine.
 - `remote_tests_rust.sh` rsyncs to the build machine and runs
  `run-rust-test.sh` remotely on the build machine. 

- `run-doxygen.sh` generates C-docs which are then uploaded to https://c.delta.chat/
+- `doxygen/Dockerfile` specifies an image that contains
+  the doxygen tool which is used by `run-doxygen.sh` 
+  to generate C-docs which are then uploaded 
+  via `ci_upload.sh` to `https://c.delta.chat/_unofficial_unreleased_docs/<BRANCH>`
+  (and the master branch is linked to https://c.delta.chat proper). 

- `run_all.sh` builds Python wheels

 ## Triggering runs on the build machine locally (fast!)

 There is experimental support for triggering a remote Python or Rust test run 
 from your local checkout/branch. You will need to be authorized to login to 
-the build machine (ask your friendly sysadmin on #deltachat Libera Chat) to type:
+the build machine (ask your friendly sysadmin on #deltachat Libera Chat) to type::

    scripts/manual_remote_tests.sh rust
    scripts/manual_remote_tests.sh python
@@ -30,18 +33,19 @@ the build machine (ask your friendly sysadmin on #deltachat Libera Chat) to type
 This will **rsync** your current checkout to the remote build machine 
 (no need to commit before) and then run either rust or python tests. 

-# coredeps Dockerfile
+# Outdated files (for later re-use)

 `coredeps/Dockerfile` specifies an image that contains all 
-of Delta Chat's core dependencies. It is used to
-build python wheels (binary packages for Python).
+of Delta Chat's core dependencies. It used to run 
+python tests and build wheels (binary packages for Python)

 You can build the docker images yourself locally
-to avoid the relatively large download:
+to avoid the relatively large download:: 
 
    cd scripts  # where all CI things are 
-    docker build -t deltachat/coredeps coredeps
+    docker build -t deltachat/coredeps docker-coredeps
+    docker build -t deltachat/doxygen docker-doxygen 

-Additionally, you can install qemu and build arm64 docker image on x86\_64 machine:
+Additionally, you can install qemu and build arm64 docker image:
    apt-get install qemu binfmt-support qemu-user-static
-    docker build -t deltachat/coredeps-arm64 --build-arg BASEIMAGE=quay.io/pypa/manylinux2014_aarch64 coredeps
+    docker build -t deltachat/coredeps-arm64 docker-coredeps-arm64
--- a/scripts/concourse/docs_wheels.yml
+++ b/scripts/concourse/docs_wheels.yml
@@ -29,19 +29,18 @@ jobs:
        - name: c-docs
      image_resource:
        source:
-          repository: alpine
+          repository: hrektts/doxygen
        type: registry-image
      platform: linux
      run:
-        path: sh
+        path: bash
        args:
-        - -ec
+        - -exc
        - |
-          apk add --no-cache doxygen git
          cd deltachat-core-rust
-          scripts/run-doxygen.sh
+          bash scripts/run-doxygen.sh
          cd ..
-          cp -av deltachat-core-rust/deltachat-ffi/html deltachat-core-rust/deltachat-ffi/xml c-docs/
+          cp -av deltachat-core-rust/deltachat-ffi/{html,xml} c-docs/

  - task: upload-c-docs
    config:
@@ -303,73 +302,3 @@ jobs:
          devpi use https://m.devpi.net/dc/master
          devpi login ((devpi.login)) --password ((devpi.password))
          devpi upload py-wheels/*musllinux_1_1_x86_64*
-
- name: python-musl-aarch64
-  plan:
-  - get: deltachat-core-rust
-  - get: deltachat-core-rust-release
-    trigger: true
-
-  # Build manylinux image with additional dependencies
-  - task: build-coredeps
-    privileged: true
-    config:
-      inputs:
-        # Building the latest, not tagged coredeps
-        - name: deltachat-core-rust
-      image_resource:
-        source:
-          repository: concourse/oci-build-task
-        type: registry-image
-      outputs:
-        - name: coredeps-image
-          path: image
-      params:
-        CONTEXT: deltachat-core-rust/scripts/coredeps
-        UNPACK_ROOTFS: "true"
-        BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_aarch64
-      platform: linux
-      caches:
-      - path: cache
-      run:
-        path: build
-
-  # Use built image to build python wheels
-  - task: build-wheels
-    image: coredeps-image
-    config:
-      inputs:
-        - name: deltachat-core-rust-release
-          path: .
-      outputs:
-        - name: py-wheels
-          path: ./python/.docker-tox/wheelhouse/
-      platform: linux
-      run:
-        path: bash
-        args:
-        - -exc
-        - |
-          scripts/run_all.sh
-
-  # Upload musl aarch64 wheels
-  - task: upload-wheels
-    config:
-      inputs:
-        - name: py-wheels
-      image_resource:
-        type: registry-image
-        source:
-          repository: debian
-      platform: linux
-      run:
-        path: sh
-        args:
-        - -ec
-        - |
-          apt-get update -y
-          apt-get install -y --no-install-recommends python3-pip python3-setuptools
-          pip3 install devpi
-          devpi use https://m.devpi.net/dc/master
-          devpi login ((devpi.login)) --password ((devpi.password))
-          devpi upload py-wheels/*musllinux_1_1_aarch64*
--- a/scripts/coverage.sh
+++ b/scripts/coverage.sh
@@ -17,7 +17,7 @@ export RUSTC_BOOTSTRAP=1
 # [2] https://github.com/mozilla/grcov/issues/595

 export CARGO_INCREMENTAL=0
-export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort -Cdebuginfo=2"
+export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
 export RUSTDOCFLAGS="-Cpanic=abort"
 cargo clean
 cargo build
--- a/scripts/docker-doxygen/Dockerfile
+++ b/scripts/docker-doxygen/Dockerfile
@@ -0,0 +1,5 @@
+FROM debian:stable
+
+# this is tagged as deltachat/doxygen 
+
+RUN apt-get update && apt-get install -y doxygen 
--- a/scripts/run-doxygen.sh
+++ b/scripts/run-doxygen.sh
@@ -1,5 +1,6 @@
-#!/bin/sh
-set -e
+#!/usr/bin/env bash
+
+set -ex

 cd deltachat-ffi 
 PROJECT_NUMBER=$(git log -1 --format="%h (%cd)") doxygen
--- a/scripts/run_all.sh
+++ b/scripts/run_all.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Build the Delta Chat Core Rust library, Python wheels and docs 

@@ -8,16 +8,21 @@ set -e -x

 # compile core lib

+export PATH=/root/.cargo/bin:$PATH
 cargo build --release -p deltachat_ffi
+# cargo test --all --all-features

 # Statically link against libdeltachat.a.
-export DCC_RS_DEV="$PWD"
+export DCC_RS_DEV=$(pwd)
 export DCC_RS_TARGET=release

+# Configure access to a base python and to several python interpreters
+# needed by tox below.
+export PATH=$PATH:/opt/python/cp37-cp37m/bin
 export PYTHONDONTWRITEBYTECODE=1
-cd python

 TOXWORKDIR=.docker-tox
+pushd python
 # prepare a clean tox run
 rm -rf tests/__pycache__
 rm -rf src/deltachat/__pycache__
@@ -28,13 +33,11 @@ mkdir -p $TOXWORKDIR
 # Note that the independent remote_tests_python step does all kinds of
 # live-testing already. 
 unset DCC_NEW_TMP_EMAIL
-
-# Try to build wheels for a range of interpreters, but don't fail if they are not available.
-# E.g. musllinux_1_1 does not have PyPy interpreters as of 2022-07-10
-tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,pypy37,pypy38,pypy39,auditwheels --skip-missing-interpreters true
+tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,pypy37,pypy38,pypy39,auditwheels
+popd


 echo -----------------------
 echo generating python docs
 echo -----------------------
-tox --workdir "$TOXWORKDIR" -e doc
+(cd python && tox --workdir "$TOXWORKDIR" -e doc)
--- a/scripts/set_core_version.py
+++ b/scripts/set_core_version.py
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -33,7 +33,7 @@ impl Accounts {
    }

    /// Creates a new default structure.
-    pub async fn create(dir: &Path) -> Result<()> {
+    pub async fn create(dir: &PathBuf) -> Result<()> {
        fs::create_dir_all(dir)
            .await
            .context("failed to create folder")?;
@@ -580,7 +580,7 @@ mod tests {
            let ids = accounts.get_all().await;
            assert_eq!(ids.len(), 1);

-            let id0 = *ids.first().unwrap();
+            let id0 = *ids.get(0).unwrap();
            let ctx = accounts.get_account(id0).await.unwrap();
            ctx.set_config(crate::config::Config::Addr, Some("one@example.org"))
                .await?;
@@ -620,7 +620,7 @@ mod tests {
            let ids = accounts.get_all().await;
            assert_eq!(ids.len(), 3);

-            let id0 = *ids.first().unwrap();
+            let id0 = *ids.get(0).unwrap();
            let ctx = accounts.get_account(id0).await.unwrap();
            assert_eq!(
                ctx.get_config(crate::config::Config::Addr).await?,
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -738,7 +738,7 @@ mod tests {
        check_image_size(avatar_src, 1000, 1000);
        check_image_size(&avatar_blob, BALANCED_AVATAR_SIZE, BALANCED_AVATAR_SIZE);

-        async fn file_size(path_buf: &Path) -> u64 {
+        async fn file_size(path_buf: &PathBuf) -> u64 {
            let file = File::open(path_buf).await.unwrap();
            file.metadata().await.unwrap().len()
        }
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -40,7 +40,7 @@ use crate::webxdc::WEBXDC_SUFFIX;
 use crate::{location, sql};

 /// An chat item, such as a message or a marker.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq)]
 pub enum ChatItem {
    Message {
        msg_id: MsgId,
@@ -1129,11 +1129,6 @@ impl Chat {
        &self.name
    }

-    /// Returns mailing list address where messages are sent to.
-    pub fn get_mailinglist_addr(&self) -> &str {
-        self.param.get(Param::ListPost).unwrap_or_default()
-    }
-
    /// Returns profile image path for the chat.
    pub async fn get_profile_image(&self, context: &Context) -> Result<Option<PathBuf>> {
        if let Some(image_rel) = self.param.get(Param::ProfileImage) {
@@ -1172,6 +1167,35 @@ impl Chat {
        Ok(color)
    }

+    /// Returns a struct describing the current state of the chat.
+    ///
+    /// This is somewhat experimental, even more so than the rest of
+    /// deltachat, and the data returned is still subject to change.
+    pub async fn get_info(&self, context: &Context) -> Result<ChatInfo> {
+        let draft = match self.id.get_draft(context).await? {
+            Some(message) => message.text.unwrap_or_default(),
+            _ => String::new(),
+        };
+        Ok(ChatInfo {
+            id: self.id,
+            type_: self.typ as u32,
+            name: self.name.clone(),
+            archived: self.visibility == ChatVisibility::Archived,
+            param: self.param.to_string(),
+            gossiped_timestamp: self.id.get_gossiped_timestamp(context).await?,
+            is_sending_locations: self.is_sending_locations,
+            color: self.get_color(context).await?,
+            profile_image: self
+                .get_profile_image(context)
+                .await?
+                .map(Into::into)
+                .unwrap_or_else(std::path::PathBuf::new),
+            draft,
+            is_muted: self.is_muted(),
+            ephemeral_timer: self.id.get_ephemeral_timer(context).await?,
+        })
+    }
+
    pub fn get_visibility(&self) -> ChatVisibility {
        self.visibility
    }
@@ -2757,7 +2781,7 @@ pub(crate) async fn shall_attach_selfavatar(context: &Context, chat_id: ChatId)
    Ok(needs_attach)
 }

-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum MuteDuration {
    NotMuted,
    Forever,
@@ -3440,6 +3464,37 @@ mod tests {
    use crate::receive_imf::receive_imf;
    use crate::test_utils::TestContext;

+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_chat_info() {
+        let t = TestContext::new().await;
+        let chat = t.create_chat_with_contact("bob", "bob@example.com").await;
+        let info = chat.get_info(&t).await.unwrap();
+
+        // Ensure we can serialize this.
+        println!("{}", serde_json::to_string_pretty(&info).unwrap());
+
+        let expected = r#"
+            {
+                "id": 10,
+                "type": 100,
+                "name": "bob",
+                "archived": false,
+                "param": "",
+                "gossiped_timestamp": 0,
+                "is_sending_locations": false,
+                "color": 35391,
+                "profile_image": "",
+                "draft": "",
+                "is_muted": false,
+                "ephemeral_timer": "Disabled"
+            }
+        "#;
+
+        // Ensure we can deserialize this.
+        let loaded: ChatInfo = serde_json::from_str(expected).unwrap();
+        assert_eq!(info, loaded);
+    }
+
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_get_draft_no_draft() {
        let t = TestContext::new().await;
--- a/src/color.rs
+++ b/src/color.rs
@@ -11,7 +11,7 @@ use sha1::{Digest, Sha1};
 fn str_to_angle(s: &str) -> f64 {
    let bytes = s.as_bytes();
    let result = Sha1::digest(bytes);
-    let checksum: u16 = result.first().map_or(0, |&x| u16::from(x))
+    let checksum: u16 = result.get(0).map_or(0, |&x| u16::from(x))
        + 256 * result.get(1).map_or(0, |&x| u16::from(x));
    f64::from(checksum) / 65536.0 * 360.0
 }
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -12,11 +12,9 @@ use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use tokio::task;

 use crate::config::Config;
-use crate::contact::addr_cmp;
 use crate::context::Context;
 use crate::imap::Imap;
 use crate::job;
-use crate::log::LogExt;
 use crate::login_param::{CertificateChecks, LoginParam, ServerLoginParam, Socks5Config};
 use crate::message::{Message, Viewtype};
 use crate::oauth2::get_oauth2_addr;
@@ -103,11 +101,35 @@ impl Context {
        info!(self, "Configure ...");

        let mut param = LoginParam::load_candidate_params(self).await?;
-        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
        let success = configure(self, &mut param).await;
        self.set_config(Config::NotifyAboutWrongPw, None).await?;

-        on_configure_completed(self, param, old_addr).await?;
+        if let Some(provider) = param.provider {
+            if let Some(config_defaults) = &provider.config_defaults {
+                for def in config_defaults.iter() {
+                    if !self.config_exists(def.key).await? {
+                        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
+                        );
+                    }
+                }
+            }
+
+            if !provider.after_login_hint.is_empty() {
+                let mut msg = Message::new(Viewtype::Text);
+                msg.text = Some(provider.after_login_hint.to_string());
+                if chat::add_device_msg(self, Some("core-provider-info"), Some(&mut msg))
+                    .await
+                    .is_err()
+                {
+                    warn!(self, "cannot add after_login_hint as core-provider-info");
+                }
+            }
+        }

        success?;
        self.set_config(Config::NotifyAboutWrongPw, Some("1"))
@@ -116,54 +138,6 @@ impl Context {
    }
 }

-async fn on_configure_completed(
-    context: &Context,
-    param: LoginParam,
-    old_addr: Option<String>,
-) -> Result<()> {
-    if let Some(provider) = param.provider {
-        if let Some(config_defaults) = &provider.config_defaults {
-            for def in config_defaults.iter() {
-                if !context.config_exists(def.key).await? {
-                    info!(context, "apply config_defaults {}={}", def.key, def.value);
-                    context.set_config(def.key, Some(def.value)).await?;
-                } else {
-                    info!(
-                        context,
-                        "skip already set config_defaults {}={}", def.key, def.value
-                    );
-                }
-            }
-        }
-
-        if !provider.after_login_hint.is_empty() {
-            let mut msg = Message::new(Viewtype::Text);
-            msg.text = Some(provider.after_login_hint.to_string());
-            if chat::add_device_msg(context, Some("core-provider-info"), Some(&mut msg))
-                .await
-                .is_err()
-            {
-                warn!(context, "cannot add after_login_hint as core-provider-info");
-            }
-        }
-    }
-
-    if let Some(new_addr) = context.get_config(Config::ConfiguredAddr).await? {
-        if let Some(old_addr) = old_addr {
-            if !addr_cmp(&new_addr, &old_addr) {
-                let mut msg = Message::new(Viewtype::Text);
-                msg.text =
-                    Some(stock_str::aeap_explanation_and_link(context, old_addr, new_addr).await);
-                chat::add_device_msg(context, None, Some(&mut msg))
-                    .await
-                    .ok_or_log_msg(context, "Cannot add AEAP explanation");
-            }
-        }
-    }
-
-    Ok(())
-}
-
 async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
    progress!(ctx, 1);

@@ -668,9 +642,6 @@ async fn nicer_configuration_error(context: &Context, errors: Vec<ConfigurationE
                .to_lowercase()
                .contains("temporary failure in name resolution")
            || e.msg.to_lowercase().contains("name or service not known")
-            || e.msg
-                .to_lowercase()
-                .contains("failed to lookup address information")
    }) {
        return stock_str::error_no_network(context).await;
    }
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -1429,7 +1429,7 @@ fn split_address_book(book: &str) -> Vec<(&str, &str)> {
        .chunks(2)
        .into_iter()
        .filter_map(|chunk| {
-            let name = chunk.first()?;
+            let name = chunk.get(0)?;
            let addr = chunk.get(1)?;
            Some((*name, *addr))
        })
--- a/src/context.rs
+++ b/src/context.rs
@@ -193,7 +193,7 @@ impl Context {
            translated_stockstrings: RwLock::new(HashMap::new()),
            events,
            scheduler: RwLock::new(None),
-            ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 6.0)), // Allow to send 6 messages immediately, no more than once every 10 seconds.
+            ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 3.0)), // Allow to send 3 messages immediately, no more than once every 20 seconds.
            quota: RwLock::new(None),
            server_id: RwLock::new(None),
            creation_time: std::time::SystemTime::now(),
@@ -594,7 +594,7 @@ impl Context {

        let list = if let Some(chat_id) = chat_id {
            do_query(
-                "SELECT m.id AS id
+                "SELECT m.id AS id, m.timestamp AS timestamp
                 FROM msgs m
                 LEFT JOIN contacts ct
                        ON m.from_id=ct.id
@@ -618,7 +618,7 @@ impl Context {
            // According to some tests, this limit speeds up eg. 2 character searches by factor 10.
            // The limit is documented and UI may add a hint when getting 1000 results.
            do_query(
-                "SELECT m.id AS id
+                "SELECT m.id AS id, m.timestamp AS timestamp
                 FROM msgs m
                 LEFT JOIN contacts ct
                        ON m.from_id=ct.id
--- a/src/decrypt.rs
+++ b/src/decrypt.rs
@@ -1,375 +0,0 @@
-//! End-to-end decryption support.
-
-use std::collections::HashSet;
-
-use anyhow::{Context as _, Result};
-use mailparse::ParsedMail;
-
-use crate::aheader::Aheader;
-use crate::contact::addr_cmp;
-use crate::context::Context;
-use crate::headerdef::HeaderDef;
-use crate::headerdef::HeaderDefMap;
-use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
-use crate::keyring::Keyring;
-use crate::log::LogExt;
-use crate::peerstate::Peerstate;
-use crate::pgp;
-
-/// Tries to decrypt a message, but only if it is structured as an
-/// Autocrypt message.
-///
-/// Returns decrypted body and a set of valid signature fingerprints
-/// if successful.
-///
-/// If the message is wrongly signed, this will still return the decrypted
-/// message but the HashSet will be empty.
-pub async fn try_decrypt(
-    context: &Context,
-    mail: &ParsedMail<'_>,
-    decryption_info: &DecryptionInfo,
-) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
-    // Possibly perform decryption
-    let public_keyring_for_validate = keyring_from_peerstate(&decryption_info.peerstate);
-
-    let encrypted_data_part = match get_autocrypt_mime(mail)
-        .or_else(|| get_mixed_up_mime(mail))
-        .or_else(|| get_attachment_mime(mail))
-    {
-        None => {
-            // not an autocrypt mime message, abort and ignore
-            return Ok(None);
-        }
-        Some(res) => res,
-    };
-    info!(context, "Detected Autocrypt-mime message");
-    let private_keyring: Keyring<SignedSecretKey> = Keyring::new_self(context)
-        .await
-        .context("failed to get own keyring")?;
-
-    decrypt_part(
-        encrypted_data_part,
-        private_keyring,
-        public_keyring_for_validate,
-    )
-    .await
-}
-
-pub async fn create_decryption_info(
-    context: &Context,
-    mail: &ParsedMail<'_>,
-    message_time: i64,
-) -> Result<DecryptionInfo> {
-    let from = mail
-        .headers
-        .get_header(HeaderDef::From_)
-        .and_then(|from_addr| mailparse::addrparse_header(from_addr).ok())
-        .and_then(|from| from.extract_single_info())
-        .map(|from| from.addr)
-        .unwrap_or_default();
-
-    let autocrypt_header = Aheader::from_headers(&from, &mail.headers)
-        .ok_or_log_msg(context, "Failed to parse Autocrypt header")
-        .flatten();
-
-    let peerstate =
-        get_autocrypt_peerstate(context, &from, autocrypt_header.as_ref(), message_time).await?;
-
-    Ok(DecryptionInfo {
-        from,
-        autocrypt_header,
-        peerstate,
-        message_time,
-    })
-}
-
-#[derive(Debug)]
-pub struct DecryptionInfo {
-    /// The From address. This is the address from the unnencrypted, outer
-    /// From header.
-    pub from: String,
-    pub autocrypt_header: Option<Aheader>,
-    /// The peerstate that will be used to validate the signatures
-    pub peerstate: Option<Peerstate>,
-    /// The timestamp when the message was sent.
-    /// If this is older than the peerstate's last_seen, this probably
-    /// means out-of-order message arrival, We don't modify the
-    /// peerstate in this case.
-    pub message_time: i64,
-}
-
-/// Returns a reference to the encrypted payload of a ["Mixed
-/// Up"][pgpmime-message-mangling] message.
-///
-/// According to [RFC 3156] encrypted messages should have
-/// `multipart/encrypted` MIME type and two parts, but Microsoft
-/// Exchange and ProtonMail IMAP/SMTP Bridge are known to mangle this
-/// structure by changing the type to `multipart/mixed` and prepending
-/// an empty part at the start.
-///
-/// ProtonMail IMAP/SMTP Bridge prepends a part literally saying
-/// "Empty Message", so we don't check its contents at all, checking
-/// only for `text/plain` type.
-///
-/// Returns `None` if the message is not a "Mixed Up" message.
-///
-/// [RFC 3156]: https://www.rfc-editor.org/info/rfc3156
-/// [pgpmime-message-mangling]: https://tools.ietf.org/id/draft-dkg-openpgp-pgpmime-message-mangling-00.html
-fn get_mixed_up_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
-    if mail.ctype.mimetype != "multipart/mixed" {
-        return None;
-    }
-    if let [first_part, second_part, third_part] = &mail.subparts[..] {
-        if first_part.ctype.mimetype == "text/plain"
-            && second_part.ctype.mimetype == "application/pgp-encrypted"
-            && third_part.ctype.mimetype == "application/octet-stream"
-        {
-            Some(third_part)
-        } else {
-            None
-        }
-    } else {
-        None
-    }
-}
-
-/// Returns a reference to the encrypted payload of a message turned into attachment.
-///
-/// Google Workspace has an option "Append footer" which appends standard footer defined
-/// by administrator to all outgoing messages. However, there is no plain text part in
-/// encrypted messages sent by Delta Chat, so Google Workspace turns the message into
-/// multipart/mixed MIME, where the first part is an empty plaintext part with a footer
-/// and the second part is the original encrypted message.
-fn get_attachment_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
-    if mail.ctype.mimetype != "multipart/mixed" {
-        return None;
-    }
-    if let [first_part, second_part] = &mail.subparts[..] {
-        if first_part.ctype.mimetype == "text/plain"
-            && second_part.ctype.mimetype == "multipart/encrypted"
-        {
-            get_autocrypt_mime(second_part)
-        } else {
-            None
-        }
-    } else {
-        None
-    }
-}
-
-/// Returns a reference to the encrypted payload of a valid PGP/MIME message.
-///
-/// Returns `None` if the message is not a valid PGP/MIME message.
-fn get_autocrypt_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
-    if mail.ctype.mimetype != "multipart/encrypted" {
-        return None;
-    }
-    if let [first_part, second_part] = &mail.subparts[..] {
-        if first_part.ctype.mimetype == "application/pgp-encrypted"
-            && second_part.ctype.mimetype == "application/octet-stream"
-        {
-            Some(second_part)
-        } else {
-            None
-        }
-    } else {
-        None
-    }
-}
-
-/// Returns Ok(None) if nothing encrypted was found.
-async fn decrypt_part(
-    mail: &ParsedMail<'_>,
-    private_keyring: Keyring<SignedSecretKey>,
-    public_keyring_for_validate: Keyring<SignedPublicKey>,
-) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
-    let data = mail.get_body_raw()?;
-
-    if has_decrypted_pgp_armor(&data) {
-        let (plain, ret_valid_signatures) =
-            pgp::pk_decrypt(data, private_keyring, &public_keyring_for_validate).await?;
-
-        // Check for detached signatures.
-        // If decrypted part is a multipart/signed, then there is a detached signature.
-        let decrypted_part = mailparse::parse_mail(&plain)?;
-        if let Some((content, valid_detached_signatures)) =
-            validate_detached_signature(&decrypted_part, &public_keyring_for_validate)?
-        {
-            return Ok(Some((content, valid_detached_signatures)));
-        } else {
-            // If the message was wrongly or not signed, still return the plain text.
-            // The caller has to check if the signatures set is empty then.
-
-            return Ok(Some((plain, ret_valid_signatures)));
-        }
-    }
-
-    Ok(None)
-}
-
-#[allow(clippy::indexing_slicing)]
-fn has_decrypted_pgp_armor(input: &[u8]) -> bool {
-    if let Some(index) = input.iter().position(|b| *b > b' ') {
-        if input.len() - index > 26 {
-            let start = index;
-            let end = start + 27;
-
-            return &input[start..end] == b"-----BEGIN PGP MESSAGE-----";
-        }
-    }
-
-    false
-}
-
-/// Validates signatures of Multipart/Signed message part, as defined in RFC 1847.
-///
-/// Returns `None` if the part is not a Multipart/Signed part, otherwise retruns the set of key
-/// fingerprints for which there is a valid signature.
-fn validate_detached_signature(
-    mail: &ParsedMail<'_>,
-    public_keyring_for_validate: &Keyring<SignedPublicKey>,
-) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
-    if mail.ctype.mimetype != "multipart/signed" {
-        return Ok(None);
-    }
-
-    if let [first_part, second_part] = &mail.subparts[..] {
-        // First part is the content, second part is the signature.
-        let content = first_part.raw_bytes;
-        let signature = second_part.get_body_raw()?;
-        let ret_valid_signatures =
-            pgp::pk_validate(content, &signature, public_keyring_for_validate)?;
-
-        Ok(Some((content.to_vec(), ret_valid_signatures)))
-    } else {
-        Ok(None)
-    }
-}
-
-fn keyring_from_peerstate(peerstate: &Option<Peerstate>) -> Keyring<SignedPublicKey> {
-    let mut public_keyring_for_validate: Keyring<SignedPublicKey> = Keyring::new();
-    if let Some(ref peerstate) = *peerstate {
-        if let Some(key) = &peerstate.public_key {
-            public_keyring_for_validate.add(key.clone());
-        } else if let Some(key) = &peerstate.gossip_key {
-            public_keyring_for_validate.add(key.clone());
-        }
-    }
-    public_keyring_for_validate
-}
-
-/// Applies Autocrypt header to Autocrypt peer state and saves it into the database.
-///
-/// If we already know this fingerprint from another contact's peerstate, return that
-/// peerstate in order to make AEAP work, but don't save it into the db yet.
-///
-/// Returns updated peerstate.
-pub(crate) async fn get_autocrypt_peerstate(
-    context: &Context,
-    from: &str,
-    autocrypt_header: Option<&Aheader>,
-    message_time: i64,
-) -> Result<Option<Peerstate>> {
-    let mut peerstate;
-
-    // Apply Autocrypt header
-    if let Some(header) = autocrypt_header {
-        // The "from_verified_fingerprint" part is for AEAP:
-        // If we know this fingerprint from another addr,
-        // we may want to do a transition from this other addr
-        // (and keep its peerstate)
-        // For security reasons, for now, we only do a transition
-        // if the fingerprint is verified.
-        peerstate = Peerstate::from_verified_fingerprint_or_addr(
-            context,
-            &header.public_key.fingerprint(),
-            from,
-        )
-        .await?;
-
-        if let Some(ref mut peerstate) = peerstate {
-            if addr_cmp(&peerstate.addr, from) {
-                peerstate.apply_header(header, message_time);
-                peerstate.save_to_db(&context.sql, false).await?;
-            }
-            // If `peerstate.addr` and `from` differ, this means that
-            // someone is using the same key but a different addr, probably
-            // because they made an AEAP transition.
-            // But we don't know if that's legit until we checked the
-            // signatures, so wait until then with writing anything
-            // to the database.
-        } else {
-            let p = Peerstate::from_header(header, message_time);
-            p.save_to_db(&context.sql, true).await?;
-            peerstate = Some(p);
-        }
-    } else {
-        peerstate = Peerstate::from_addr(context, from).await?;
-    }
-
-    Ok(peerstate)
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::receive_imf::receive_imf;
-    use crate::test_utils::TestContext;
-
-    use super::*;
-
-    #[test]
-    fn test_has_decrypted_pgp_armor() {
-        let data = b" -----BEGIN PGP MESSAGE-----";
-        assert_eq!(has_decrypted_pgp_armor(data), true);
-
-        let data = b"    \n-----BEGIN PGP MESSAGE-----";
-        assert_eq!(has_decrypted_pgp_armor(data), true);
-
-        let data = b"    -----BEGIN PGP MESSAGE---";
-        assert_eq!(has_decrypted_pgp_armor(data), false);
-
-        let data = b" -----BEGIN PGP MESSAGE-----";
-        assert_eq!(has_decrypted_pgp_armor(data), true);
-
-        let data = b"blas";
-        assert_eq!(has_decrypted_pgp_armor(data), false);
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_mixed_up_mime() -> Result<()> {
-        // "Mixed Up" mail as received when sending an encrypted
-        // message using Delta Chat Desktop via ProtonMail IMAP/SMTP
-        // Bridge.
-        let mixed_up_mime = include_bytes!("../test-data/message/protonmail-mixed-up.eml");
-        let mail = mailparse::parse_mail(mixed_up_mime)?;
-        assert!(get_autocrypt_mime(&mail).is_none());
-        assert!(get_mixed_up_mime(&mail).is_some());
-        assert!(get_attachment_mime(&mail).is_none());
-
-        // Same "Mixed Up" mail repaired by Thunderbird 78.9.0.
-        //
-        // It added `X-Enigmail-Info: Fixed broken PGP/MIME message`
-        // header although the repairing is done by the built-in
-        // OpenPGP support, not Enigmail.
-        let repaired_mime = include_bytes!("../test-data/message/protonmail-repaired.eml");
-        let mail = mailparse::parse_mail(repaired_mime)?;
-        assert!(get_autocrypt_mime(&mail).is_some());
-        assert!(get_mixed_up_mime(&mail).is_none());
-        assert!(get_attachment_mime(&mail).is_none());
-
-        // Another form of "Mixed Up" mail created by Google Workspace,
-        // where original message is turned into attachment to empty plaintext message.
-        let attachment_mime = include_bytes!("../test-data/message/google-workspace-mixed-up.eml");
-        let mail = mailparse::parse_mail(attachment_mime)?;
-        assert!(get_autocrypt_mime(&mail).is_none());
-        assert!(get_mixed_up_mime(&mail).is_none());
-        assert!(get_attachment_mime(&mail).is_some());
-
-        let bob = TestContext::new_bob().await;
-        receive_imf(&bob, attachment_mime, false).await?;
-        let msg = bob.get_last_msg().await;
-        assert_eq!(msg.text.as_deref(), Some("Hello from Thunderbird!"));
-
-        Ok(())
-    }
-}
--- a/src/download.rs
+++ b/src/download.rs
@@ -11,7 +11,7 @@ use crate::imap::{Imap, ImapActionResult};
 use crate::job::{self, Action, Job, Status};
 use crate::message::{Message, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, Part};
-use crate::param::{Param, Params};
+use crate::param::Params;
 use crate::tools::time;
 use crate::{job_try, stock_str, EventType};
 use std::cmp::max;
@@ -69,42 +69,6 @@ impl Context {
            Ok(Some(max(MIN_DOWNLOAD_LIMIT, download_limit as u32)))
        }
    }
-
-    // Merges the two messages to `placeholder_msg_id`;
-    // `full_msg_id` is no longer used afterwards.
-    pub(crate) async fn merge_messages(
-        &self,
-        full_msg_id: MsgId,
-        placeholder_msg_id: MsgId,
-    ) -> Result<()> {
-        let placeholder = Message::load_from_db(self, placeholder_msg_id).await?;
-        self.sql
-            .transaction(move |transaction| {
-                transaction
-                    .execute("DELETE FROM msgs WHERE id=?;", paramsv![placeholder_msg_id])?;
-                transaction.execute(
-                    "UPDATE msgs SET id=? WHERE id=?",
-                    paramsv![placeholder_msg_id, full_msg_id],
-                )?;
-                Ok(())
-            })
-            .await?;
-        let mut full = Message::load_from_db(self, placeholder_msg_id).await?;
-
-        for key in [
-            Param::WebxdcSummary,
-            Param::WebxdcSummaryTimestamp,
-            Param::WebxdcDocument,
-            Param::WebxdcDocumentTimestamp,
-        ] {
-            if let Some(value) = placeholder.param.get(key) {
-                full.param.set(key, value);
-            }
-        }
-        full.update_param(self).await?;
-
-        Ok(())
-    }
 }

 impl MsgId {
@@ -292,7 +256,7 @@ impl MimeMessage {
 mod tests {
    use num_traits::FromPrimitive;

-    use crate::chat::{get_chat_msgs, send_msg};
+    use crate::chat::send_msg;
    use crate::ephemeral::Timer;
    use crate::message::Viewtype;
    use crate::receive_imf::receive_imf_inner;
@@ -446,119 +410,4 @@ mod tests {

        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_status_update_expands_to_nothing() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
-        let chat_id = alice.create_chat(&bob).await.id;
-
-        let file = alice.get_blobdir().join("minimal.xdc");
-        tokio::fs::write(&file, include_bytes!("../test-data/webxdc/minimal.xdc")).await?;
-        let mut instance = Message::new(Viewtype::File);
-        instance.set_file(file.to_str().unwrap(), None);
-        let _sent1 = alice.send_msg(chat_id, &mut instance).await;
-
-        alice
-            .send_webxdc_status_update(instance.id, r#"{"payload":7}"#, "d")
-            .await?;
-        alice.flush_status_updates().await?;
-        let sent2 = alice.pop_sent_msg().await;
-        let sent2_rfc742_mid = Message::load_from_db(&alice, sent2.sender_msg_id)
-            .await?
-            .rfc724_mid;
-
-        // not downloading the status update results in an placeholder
-        receive_imf_inner(
-            &bob,
-            &sent2_rfc742_mid,
-            sent2.payload().as_bytes(),
-            false,
-            Some(sent2.payload().len() as u32),
-            false,
-        )
-        .await?;
-        let msg = bob.get_last_msg().await;
-        let chat_id = msg.chat_id;
-        assert_eq!(get_chat_msgs(&bob, chat_id, 0).await?.len(), 1);
-        assert_eq!(msg.download_state(), DownloadState::Available);
-
-        // downloading the status update afterwards expands to nothing and moves the placeholder to trash-chat
-        // (usually status updates are too small for not being downloaded directly)
-        receive_imf_inner(
-            &bob,
-            &sent2_rfc742_mid,
-            sent2.payload().as_bytes(),
-            false,
-            None,
-            false,
-        )
-        .await?;
-        assert_eq!(get_chat_msgs(&bob, chat_id, 0).await?.len(), 0);
-        assert!(Message::load_from_db(&bob, msg.id)
-            .await?
-            .chat_id
-            .is_trash());
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_mdn_expands_to_nothing() -> Result<()> {
-        let bob = TestContext::new_bob().await;
-        let raw = b"Subject: Message opened\n\
-            Date: Mon, 10 Jan 2020 00:00:00 +0000\n\
-            Chat-Version: 1.0\n\
-            Message-ID: <bar@example.org>\n\
-            To: Alice <alice@example.org>\n\
-            From: Bob <bob@example.org>\n\
-            Content-Type: multipart/report; report-type=disposition-notification;\n\t\
-            boundary=\"kJBbU58X1xeWNHgBtTbMk80M5qnV4N\"\n\
-            \n\
-            \n\
-            --kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-            Content-Type: text/plain; charset=utf-8\n\
-            \n\
-            bla\n\
-            \n\
-            \n\
-            --kJBbU58X1xeWNHgBtTbMk80M5qnV4N\n\
-            Content-Type: message/disposition-notification\n\
-            \n\
-            Reporting-UA: Delta Chat 1.88.0\n\
-            Original-Recipient: rfc822;bob@example.org\n\
-            Final-Recipient: rfc822;bob@example.org\n\
-            Original-Message-ID: <foo@example.org>\n\
-            Disposition: manual-action/MDN-sent-automatically; displayed\n\
-            \n\
-            \n\
-            --kJBbU58X1xeWNHgBtTbMk80M5qnV4N--\n\
-            ";
-
-        // not downloading the mdn results in an placeholder
-        receive_imf_inner(
-            &bob,
-            "bar@example.org",
-            raw,
-            false,
-            Some(raw.len() as u32),
-            false,
-        )
-        .await?;
-        let msg = bob.get_last_msg().await;
-        let chat_id = msg.chat_id;
-        assert_eq!(get_chat_msgs(&bob, chat_id, 0).await?.len(), 1);
-        assert_eq!(msg.download_state(), DownloadState::Available);
-
-        // downloading the mdn afterwards expands to nothing and deletes the placeholder directly
-        // (usually mdn are too small for not being downloaded directly)
-        receive_imf_inner(&bob, "bar@example.org", raw, false, None, false).await?;
-        assert_eq!(get_chat_msgs(&bob, chat_id, 0).await?.len(), 0);
-        assert!(Message::load_from_db(&bob, msg.id)
-            .await?
-            .chat_id
-            .is_trash());
-
-        Ok(())
-    }
 }
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -1,13 +1,20 @@
 //! End-to-end encryption support.

+use std::collections::HashSet;
+
 use anyhow::{format_err, Context as _, Result};
+use mailparse::ParsedMail;
 use num_traits::FromPrimitive;

 use crate::aheader::{Aheader, EncryptPreference};
 use crate::config::Config;
+use crate::contact::addr_cmp;
 use crate::context::Context;
-use crate::key::{DcKey, SignedPublicKey, SignedSecretKey};
+use crate::headerdef::HeaderDef;
+use crate::headerdef::HeaderDefMap;
+use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
 use crate::keyring::Keyring;
+use crate::log::LogExt;
 use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::pgp;

@@ -126,6 +133,299 @@ impl EncryptHelper {
    }
 }

+/// Applies Autocrypt header to Autocrypt peer state and saves it into the database.
+///
+/// If we already know this fingerprint from another contact's peerstate, return that
+/// peerstate in order to make AEAP work, but don't save it into the db yet.
+///
+/// Returns updated peerstate.
+pub(crate) async fn get_autocrypt_peerstate(
+    context: &Context,
+    from: &str,
+    autocrypt_header: Option<&Aheader>,
+    message_time: i64,
+) -> Result<Option<Peerstate>> {
+    let mut peerstate;
+
+    // Apply Autocrypt header
+    if let Some(header) = autocrypt_header {
+        // The "from_nongossiped_fingerprint" part is for AEAP:
+        // If we know this fingerprint from another addr,
+        // we may want to do a transition from this other addr
+        // (and keep its peerstate)
+        peerstate = Peerstate::from_nongossiped_fingerprint_or_addr(
+            context,
+            &header.public_key.fingerprint(),
+            from,
+        )
+        .await?;
+
+        if let Some(ref mut peerstate) = peerstate {
+            if addr_cmp(&peerstate.addr, from) {
+                peerstate.apply_header(header, message_time);
+                peerstate.save_to_db(&context.sql, false).await?;
+            }
+            // If `peerstate.addr` and `from` differ, this means that
+            // someone is using the same key but a different addr, probably
+            // because they made an AEAP transition.
+            // But we don't know if that's legit until we checked the
+            // signatures, so wait until then with writing anything
+            // to the database.
+        } else {
+            let p = Peerstate::from_header(header, message_time);
+            p.save_to_db(&context.sql, true).await?;
+            peerstate = Some(p);
+        }
+    } else {
+        peerstate = Peerstate::from_addr(context, from).await?;
+    }
+
+    Ok(peerstate)
+}
+
+/// Tries to decrypt a message, but only if it is structured as an
+/// Autocrypt message.
+///
+/// Returns decrypted body and a set of valid signature fingerprints
+/// if successful.
+///
+/// If the message is wrongly signed, this will still return the decrypted
+/// message but the HashSet will be empty.
+pub async fn try_decrypt(
+    context: &Context,
+    mail: &ParsedMail<'_>,
+    decryption_info: &DecryptionInfo,
+) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
+    // Possibly perform decryption
+    let public_keyring_for_validate = keyring_from_peerstate(&decryption_info.peerstate);
+
+    let context = context;
+    let encrypted_data_part = match get_autocrypt_mime(mail)
+        .or_else(|| get_mixed_up_mime(mail))
+        .or_else(|| get_attachment_mime(mail))
+    {
+        None => {
+            // not an autocrypt mime message, abort and ignore
+            return Ok(None);
+        }
+        Some(res) => res,
+    };
+    info!(context, "Detected Autocrypt-mime message");
+    let private_keyring: Keyring<SignedSecretKey> = Keyring::new_self(context)
+        .await
+        .context("failed to get own keyring")?;
+
+    decrypt_part(
+        encrypted_data_part,
+        private_keyring,
+        public_keyring_for_validate,
+    )
+    .await
+}
+
+pub async fn create_decryption_info(
+    context: &Context,
+    mail: &ParsedMail<'_>,
+    message_time: i64,
+) -> Result<DecryptionInfo> {
+    let from = mail
+        .headers
+        .get_header(HeaderDef::From_)
+        .and_then(|from_addr| mailparse::addrparse_header(from_addr).ok())
+        .and_then(|from| from.extract_single_info())
+        .map(|from| from.addr)
+        .unwrap_or_default();
+
+    let autocrypt_header = Aheader::from_headers(&from, &mail.headers)
+        .ok_or_log_msg(context, "Failed to parse Autocrypt header")
+        .flatten();
+
+    let peerstate =
+        get_autocrypt_peerstate(context, &from, autocrypt_header.as_ref(), message_time).await?;
+
+    Ok(DecryptionInfo {
+        from,
+        autocrypt_header,
+        peerstate,
+        message_time,
+    })
+}
+
+#[derive(Debug)]
+pub struct DecryptionInfo {
+    /// The From address. This is the address from the unnencrypted, outer
+    /// From header.
+    pub from: String,
+    pub autocrypt_header: Option<Aheader>,
+    /// The peerstate that will be used to validate the signatures
+    pub peerstate: Option<Peerstate>,
+    /// The timestamp when the message was sent.
+    /// If this is older than the peerstate's last_seen, this probably
+    /// means out-of-order message arrival, We don't modify the
+    /// peerstate in this case.
+    pub message_time: i64,
+}
+
+/// Returns a reference to the encrypted payload of a valid PGP/MIME message.
+///
+/// Returns `None` if the message is not a valid PGP/MIME message.
+fn get_autocrypt_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
+    if mail.ctype.mimetype != "multipart/encrypted" {
+        return None;
+    }
+    if let [first_part, second_part] = &mail.subparts[..] {
+        if first_part.ctype.mimetype == "application/pgp-encrypted"
+            && second_part.ctype.mimetype == "application/octet-stream"
+        {
+            Some(second_part)
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
+/// Returns a reference to the encrypted payload of a ["Mixed
+/// Up"][pgpmime-message-mangling] message.
+///
+/// According to [RFC 3156] encrypted messages should have
+/// `multipart/encrypted` MIME type and two parts, but Microsoft
+/// Exchange and ProtonMail IMAP/SMTP Bridge are known to mangle this
+/// structure by changing the type to `multipart/mixed` and prepending
+/// an empty part at the start.
+///
+/// ProtonMail IMAP/SMTP Bridge prepends a part literally saying
+/// "Empty Message", so we don't check its contents at all, checking
+/// only for `text/plain` type.
+///
+/// Returns `None` if the message is not a "Mixed Up" message.
+///
+/// [RFC 3156]: https://www.rfc-editor.org/info/rfc3156
+/// [pgpmime-message-mangling]: https://tools.ietf.org/id/draft-dkg-openpgp-pgpmime-message-mangling-00.html
+fn get_mixed_up_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
+    if mail.ctype.mimetype != "multipart/mixed" {
+        return None;
+    }
+    if let [first_part, second_part, third_part] = &mail.subparts[..] {
+        if first_part.ctype.mimetype == "text/plain"
+            && second_part.ctype.mimetype == "application/pgp-encrypted"
+            && third_part.ctype.mimetype == "application/octet-stream"
+        {
+            Some(third_part)
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
+/// Returns a reference to the encrypted payload of a message turned into attachment.
+///
+/// Google Workspace has an option "Append footer" which appends standard footer defined
+/// by administrator to all outgoing messages. However, there is no plain text part in
+/// encrypted messages sent by Delta Chat, so Google Workspace turns the message into
+/// multipart/mixed MIME, where the first part is an empty plaintext part with a footer
+/// and the second part is the original encrypted message.
+fn get_attachment_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
+    if mail.ctype.mimetype != "multipart/mixed" {
+        return None;
+    }
+    if let [first_part, second_part] = &mail.subparts[..] {
+        if first_part.ctype.mimetype == "text/plain"
+            && second_part.ctype.mimetype == "multipart/encrypted"
+        {
+            get_autocrypt_mime(second_part)
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
+fn keyring_from_peerstate(peerstate: &Option<Peerstate>) -> Keyring<SignedPublicKey> {
+    let mut public_keyring_for_validate: Keyring<SignedPublicKey> = Keyring::new();
+    if let Some(ref peerstate) = *peerstate {
+        if let Some(key) = &peerstate.public_key {
+            public_keyring_for_validate.add(key.clone());
+        } else if let Some(key) = &peerstate.gossip_key {
+            public_keyring_for_validate.add(key.clone());
+        }
+    }
+    public_keyring_for_validate
+}
+
+/// Validates signatures of Multipart/Signed message part, as defined in RFC 1847.
+///
+/// Returns `None` if the part is not a Multipart/Signed part, otherwise retruns the set of key
+/// fingerprints for which there is a valid signature.
+fn validate_detached_signature(
+    mail: &ParsedMail<'_>,
+    public_keyring_for_validate: &Keyring<SignedPublicKey>,
+) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
+    if mail.ctype.mimetype != "multipart/signed" {
+        return Ok(None);
+    }
+
+    if let [first_part, second_part] = &mail.subparts[..] {
+        // First part is the content, second part is the signature.
+        let content = first_part.raw_bytes;
+        let signature = second_part.get_body_raw()?;
+        let ret_valid_signatures =
+            pgp::pk_validate(content, &signature, public_keyring_for_validate)?;
+
+        Ok(Some((content.to_vec(), ret_valid_signatures)))
+    } else {
+        Ok(None)
+    }
+}
+
+/// Returns Ok(None) if nothing encrypted was found.
+async fn decrypt_part(
+    mail: &ParsedMail<'_>,
+    private_keyring: Keyring<SignedSecretKey>,
+    public_keyring_for_validate: Keyring<SignedPublicKey>,
+) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
+    let data = mail.get_body_raw()?;
+
+    if has_decrypted_pgp_armor(&data) {
+        let (plain, ret_valid_signatures) =
+            pgp::pk_decrypt(data, private_keyring, &public_keyring_for_validate).await?;
+
+        // Check for detached signatures.
+        // If decrypted part is a multipart/signed, then there is a detached signature.
+        let decrypted_part = mailparse::parse_mail(&plain)?;
+        if let Some((content, valid_detached_signatures)) =
+            validate_detached_signature(&decrypted_part, &public_keyring_for_validate)?
+        {
+            return Ok(Some((content, valid_detached_signatures)));
+        } else {
+            // If the message was wrongly or not signed, still return the plain text.
+            // The caller has to check if the signatures set is empty then.
+
+            return Ok(Some((plain, ret_valid_signatures)));
+        }
+    }
+
+    Ok(None)
+}
+
+#[allow(clippy::indexing_slicing)]
+fn has_decrypted_pgp_armor(input: &[u8]) -> bool {
+    if let Some(index) = input.iter().position(|b| *b > b' ') {
+        if input.len() - index > 26 {
+            let start = index;
+            let end = start + 27;
+
+            return &input[start..end] == b"-----BEGIN PGP MESSAGE-----";
+        }
+    }
+
+    false
+}
+
 /// Ensures a private key exists for the configured user.
 ///
 /// Normally the private key is generated when the first message is
@@ -148,6 +448,7 @@ mod tests {
    use crate::message::{Message, Viewtype};
    use crate::param::Param;
    use crate::peerstate::ToSave;
+    use crate::receive_imf::receive_imf;
    use crate::test_utils::{bob_keypair, TestContext};

    use super::*;
@@ -195,6 +496,24 @@ Sent with my Delta Chat Messenger: https://delta.chat";
        );
    }

+    #[test]
+    fn test_has_decrypted_pgp_armor() {
+        let data = b" -----BEGIN PGP MESSAGE-----";
+        assert_eq!(has_decrypted_pgp_armor(data), true);
+
+        let data = b"    \n-----BEGIN PGP MESSAGE-----";
+        assert_eq!(has_decrypted_pgp_armor(data), true);
+
+        let data = b"    -----BEGIN PGP MESSAGE---";
+        assert_eq!(has_decrypted_pgp_armor(data), false);
+
+        let data = b" -----BEGIN PGP MESSAGE-----";
+        assert_eq!(has_decrypted_pgp_armor(data), true);
+
+        let data = b"blas";
+        assert_eq!(has_decrypted_pgp_armor(data), false);
+    }
+
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_encrypted_no_autocrypt() -> anyhow::Result<()> {
        let alice = TestContext::new_alice().await;
@@ -329,4 +648,42 @@ Sent with my Delta Chat Messenger: https://delta.chat";
        assert!(encrypt_helper.should_encrypt(&t, true, &ps).is_err());
        assert!(!encrypt_helper.should_encrypt(&t, false, &ps).unwrap());
    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_mixed_up_mime() -> Result<()> {
+        // "Mixed Up" mail as received when sending an encrypted
+        // message using Delta Chat Desktop via ProtonMail IMAP/SMTP
+        // Bridge.
+        let mixed_up_mime = include_bytes!("../test-data/message/protonmail-mixed-up.eml");
+        let mail = mailparse::parse_mail(mixed_up_mime)?;
+        assert!(get_autocrypt_mime(&mail).is_none());
+        assert!(get_mixed_up_mime(&mail).is_some());
+        assert!(get_attachment_mime(&mail).is_none());
+
+        // Same "Mixed Up" mail repaired by Thunderbird 78.9.0.
+        //
+        // It added `X-Enigmail-Info: Fixed broken PGP/MIME message`
+        // header although the repairing is done by the built-in
+        // OpenPGP support, not Enigmail.
+        let repaired_mime = include_bytes!("../test-data/message/protonmail-repaired.eml");
+        let mail = mailparse::parse_mail(repaired_mime)?;
+        assert!(get_autocrypt_mime(&mail).is_some());
+        assert!(get_mixed_up_mime(&mail).is_none());
+        assert!(get_attachment_mime(&mail).is_none());
+
+        // Another form of "Mixed Up" mail created by Google Workspace,
+        // where original message is turned into attachment to empty plaintext message.
+        let attachment_mime = include_bytes!("../test-data/message/google-workspace-mixed-up.eml");
+        let mail = mailparse::parse_mail(attachment_mime)?;
+        assert!(get_autocrypt_mime(&mail).is_none());
+        assert!(get_mixed_up_mime(&mail).is_none());
+        assert!(get_attachment_mime(&mail).is_some());
+
+        let bob = TestContext::new_bob().await;
+        receive_imf(&bob, attachment_mime, false).await?;
+        let msg = bob.get_last_msg().await;
+        assert_eq!(msg.text.as_deref(), Some("Hello from Thunderbird!"));
+
+        Ok(())
+    }
 }
--- a/src/job.rs
+++ b/src/job.rs
@@ -69,7 +69,7 @@ pub enum Action {
    ResyncFolders = 300,
 }

-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Job {
    pub job_id: u32,
    pub action: Action,
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,7 +15,7 @@
 )]
 #![allow(
    clippy::match_bool,
-    clippy::mixed_read_write_in_expression,
+    clippy::eval_order_dependence,
    clippy::bool_assert_comparison,
    clippy::manual_split_once,
    clippy::format_push_string
@@ -58,7 +58,6 @@ mod configure;
 pub mod constants;
 pub mod contact;
 pub mod context;
-mod decrypt;
 pub mod download;
 mod e2ee;
 pub mod ephemeral;
--- a/src/login_param.rs
+++ b/src/login_param.rs
@@ -39,7 +39,7 @@ impl Default for CertificateChecks {
 }

 /// Login parameters for a single server, either IMAP or SMTP
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Default, Debug, Clone, PartialEq)]
 pub struct ServerLoginParam {
    pub server: String,
    pub user: String,
@@ -53,7 +53,7 @@ pub struct ServerLoginParam {
    pub certificate_checks: CertificateChecks,
 }

-#[derive(Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Default, Debug, Clone, PartialEq)]
 pub struct Socks5Config {
    pub host: String,
    pub port: u16,
@@ -128,7 +128,7 @@ impl fmt::Display for Socks5Config {
    }
 }

-#[derive(Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Default, Debug, Clone, PartialEq)]
 pub struct LoginParam {
    pub addr: String,
    pub imap: ServerLoginParam,
--- a/src/message.rs
+++ b/src/message.rs
@@ -19,7 +19,7 @@ use crate::download::DownloadState;
 use crate::ephemeral::{start_ephemeral_timers_msgids, Timer as EphemeralTimer};
 use crate::events::EventType;
 use crate::imap::markseen_on_imap_table;
-use crate::mimeparser::{parse_message_id, DeliveryReport, SystemMessage};
+use crate::mimeparser::{parse_message_id, FailureReport, SystemMessage};
 use crate::param::{Param, Params};
 use crate::pgp::split_armored_data;
 use crate::scheduler::InterruptInfo;
@@ -1532,7 +1532,7 @@ pub async fn handle_mdn(
 /// Where appropriate, also adds an info message telling the user which of the recipients of a group message failed.
 pub(crate) async fn handle_ndn(
    context: &Context,
-    failed: &DeliveryReport,
+    failed: &FailureReport,
    error: Option<String>,
 ) -> Result<()> {
    if failed.rfc724_mid.is_empty() {
@@ -1588,7 +1588,7 @@ pub(crate) async fn handle_ndn(

 async fn ndn_maybe_add_info_msg(
    context: &Context,
-    failed: &DeliveryReport,
+    failed: &FailureReport,
    chat_id: ChatId,
    chat_type: Chattype,
 ) -> Result<()> {
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -15,8 +15,8 @@ use crate::blob::BlobObject;
 use crate::constants::{DC_DESIRED_TEXT_LEN, DC_ELLIPSIS};
 use crate::contact::{addr_cmp, addr_normalize, ContactId};
 use crate::context::Context;
-use crate::decrypt::{create_decryption_info, try_decrypt};
 use crate::dehtml::dehtml;
+use crate::e2ee;
 use crate::events::EventType;
 use crate::format_flowed::unformat_flowed;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
@@ -73,7 +73,7 @@ pub struct MimeMessage {
    pub(crate) user_avatar: Option<AvatarAction>,
    pub(crate) group_avatar: Option<AvatarAction>,
    pub(crate) mdn_reports: Vec<Report>,
-    pub(crate) delivery_report: Option<DeliveryReport>,
+    pub(crate) failure_report: Option<FailureReport>,

    /// Standard USENET signature, if any.
    pub(crate) footer: Option<String>,
@@ -220,11 +220,12 @@ impl MimeMessage {
        let mut mail_raw = Vec::new();
        let mut gossiped_addr = Default::default();
        let mut from_is_signed = false;
-        let mut decryption_info = create_decryption_info(context, &mail, message_time).await?;
+        let mut decryption_info =
+            e2ee::create_decryption_info(context, &mail, message_time).await?;

        // `signatures` is non-empty exactly if the message was encrypted and correctly signed.
        let (mail, signatures, warn_empty_signature) =
-            match try_decrypt(context, &mail, &decryption_info).await {
+            match e2ee::try_decrypt(context, &mail, &decryption_info).await {
                Ok(Some((raw, signatures))) => {
                    // Encrypted, but maybe unsigned message. Only if
                    // `signatures` set is non-empty, it is a valid
@@ -331,7 +332,7 @@ impl MimeMessage {
            webxdc_status_update: None,
            user_avatar: None,
            group_avatar: None,
-            delivery_report: None,
+            failure_report: None,
            footer: None,
            is_mime_modified: false,
            decoded_data: Vec::new(),
@@ -416,8 +417,6 @@ impl MimeMessage {
                self.is_system_message = SystemMessage::ChatProtectionEnabled;
            } else if value == "protection-disabled" {
                self.is_system_message = SystemMessage::ChatProtectionDisabled;
-            } else if value == "group-avatar-changed" {
-                self.is_system_message = SystemMessage::GroupImageChanged;
            }
        } else if self.get_header(HeaderDef::ChatGroupMemberRemoved).is_some() {
            self.is_system_message = SystemMessage::MemberRemovedFromGroup;
@@ -425,6 +424,10 @@ impl MimeMessage {
            self.is_system_message = SystemMessage::MemberAddedToGroup;
        } else if self.get_header(HeaderDef::ChatGroupNameChanged).is_some() {
            self.is_system_message = SystemMessage::GroupNameChanged;
+        } else if let Some(value) = self.get_header(HeaderDef::ChatContent) {
+            if value == "group-avatar-changed" {
+                self.is_system_message = SystemMessage::GroupImageChanged;
+            }
        }
    }

@@ -532,9 +535,7 @@ impl MimeMessage {
        self.parse_system_message_headers(context);
        self.parse_avatar_headers(context).await;
        self.parse_videochat_headers();
-        if self.delivery_report.is_none() {
-            self.squash_attachment_parts();
-        }
+        self.squash_attachment_parts();

        if let Some(ref subject) = self.get_subject() {
            let mut prepend_subject = true;
@@ -866,7 +867,7 @@ impl MimeMessage {
                        // Some providers, e.g. Tiscali, forget to set the report-type. So, if it's None, assume that it might be delivery-status
                        Some("delivery-status") | None => {
                            if let Some(report) = self.process_delivery_status(context, mail)? {
-                                self.delivery_report = Some(report);
+                                self.failure_report = Some(report);
                            }

                            // Add all parts (we need another part, preferably text/plain, to show as an error message)
@@ -1277,46 +1278,9 @@ impl MimeMessage {
        &self,
        context: &Context,
        report: &mailparse::ParsedMail<'_>,
-    ) -> Result<Option<DeliveryReport>> {
-        // Assume failure.
-        let mut failure = true;
-
-        if let Some(status_part) = report.subparts.get(1) {
-            // RFC 3464 defines `message/delivery-status`
-            // RFC 6533 defines `message/global-delivery-status`
-            if status_part.ctype.mimetype != "message/delivery-status"
-                && status_part.ctype.mimetype != "message/global-delivery-status"
-            {
-                warn!(context, "Second part of Delivery Status Notification is not message/delivery-status or message/global-delivery-status, ignoring");
-                return Ok(None);
-            }
-
-            let status_body = status_part.get_body_raw()?;
-
-            // Skip per-message fields.
-            let (_, sz) = mailparse::parse_headers(&status_body)?;
-
-            // Parse first set of per-recipient fields
-            if let Some(status_body) = status_body.get(sz..) {
-                let (status_fields, _) = mailparse::parse_headers(status_body)?;
-                if let Some(action) = status_fields.get_first_value("action") {
-                    if action != "failed" {
-                        info!(context, "DSN with {:?} action", action);
-                        failure = false;
-                    }
-                } else {
-                    warn!(context, "DSN without action");
-                }
-            } else {
-                warn!(context, "DSN without per-recipient fields");
-            }
-        } else {
-            // No message/delivery-status part.
-            return Ok(None);
-        }
-
+    ) -> Result<Option<FailureReport>> {
        // parse as mailheaders
-        if let Some(original_msg) = report.subparts.get(2).filter(|p| {
+        if let Some(original_msg) = report.subparts.iter().find(|p| {
            p.ctype.mimetype.contains("rfc822")
                || p.ctype.mimetype == "message/global"
                || p.ctype.mimetype == "message/global-headers"
@@ -1337,10 +1301,9 @@ impl MimeMessage {
                    None // We do not know which recipient failed
                };

-                return Ok(Some(DeliveryReport {
+                return Ok(Some(FailureReport {
                    rfc724_mid: original_message_id,
                    failed_recipient: to.map(|s| s.addr),
-                    failure,
                }));
            }

@@ -1421,7 +1384,7 @@ impl MimeMessage {
        } else {
            false
        };
-        if maybe_ndn && self.delivery_report.is_none() {
+        if maybe_ndn && self.failure_report.is_none() {
            static RE: Lazy<regex::Regex> =
                Lazy::new(|| regex::Regex::new(r"Message-ID:(.*)").unwrap());
            for captures in self
@@ -1435,10 +1398,9 @@ impl MimeMessage {
                    if let Ok(Some(_)) =
                        message::rfc724_mid_exists(context, &original_message_id).await
                    {
-                        self.delivery_report = Some(DeliveryReport {
+                        self.failure_report = Some(FailureReport {
                            rfc724_mid: original_message_id,
                            failed_recipient: None,
-                            failure: true,
                        })
                    }
                }
@@ -1476,15 +1438,13 @@ impl MimeMessage {
            }
        }

-        if let Some(delivery_report) = &self.delivery_report {
-            if delivery_report.failure {
-                let error = parts
-                    .iter()
-                    .find(|p| p.typ == Viewtype::Text)
-                    .map(|p| p.msg.clone());
-                if let Err(e) = message::handle_ndn(context, delivery_report, error).await {
-                    warn!(context, "Could not handle ndn: {}", e);
-                }
+        if let Some(failure_report) = &self.failure_report {
+            let error = parts
+                .iter()
+                .find(|p| p.typ == Viewtype::Text)
+                .map(|p| p.msg.clone());
+            if let Err(e) = message::handle_ndn(context, failure_report, error).await {
+                warn!(context, "Could not handle ndn: {}", e);
            }
        }
    }
@@ -1564,7 +1524,6 @@ async fn update_gossip_peerstates(
    Ok(gossiped_addr)
 }

-/// Message Disposition Notification (RFC 8098)
 #[derive(Debug)]
 pub(crate) struct Report {
    /// Original-Message-ID header
@@ -1576,12 +1535,10 @@ pub(crate) struct Report {
    additional_message_ids: Vec<String>,
 }

-/// Delivery Status Notification (RFC 3464, RFC 6533)
 #[derive(Debug)]
-pub(crate) struct DeliveryReport {
+pub(crate) struct FailureReport {
    pub rfc724_mid: String,
    pub failed_recipient: Option<String>,
-    pub failure: bool,
 }

 #[allow(clippy::indexing_slicing)]
--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -9,7 +9,6 @@ use crate::chatlist::Chatlist;
 use crate::constants::Chattype;
 use crate::contact::{addr_cmp, Contact, Origin};
 use crate::context::Context;
-use crate::decrypt::DecryptionInfo;
 use crate::events::EventType;
 use crate::key::{DcKey, Fingerprint, SignedPublicKey};
 use crate::message::Message;
@@ -166,7 +165,7 @@ impl Peerstate {
        Self::from_stmt(context, query, paramsv![fp, fp, fp]).await
    }

-    pub async fn from_verified_fingerprint_or_addr(
+    pub async fn from_nongossiped_fingerprint_or_addr(
        context: &Context,
        fingerprint: &Fingerprint,
        addr: &str,
@@ -175,9 +174,9 @@ impl Peerstate {
                     gossip_timestamp, gossip_key, public_key_fingerprint, gossip_key_fingerprint, \
                     verified_key, verified_key_fingerprint \
                     FROM acpeerstates  \
-                     WHERE verified_key_fingerprint=? \
+                     WHERE public_key_fingerprint=? \
                     OR addr=? COLLATE NOCASE \
-                     ORDER BY verified_key_fingerprint=? DESC, last_seen DESC LIMIT 1;";
+                     ORDER BY public_key_fingerprint=? DESC, last_seen DESC LIMIT 1;";
        let fp = fingerprint.hex();
        Self::from_stmt(context, query, paramsv![fp, addr, fp]).await
    }
@@ -517,22 +516,22 @@ impl Peerstate {
            .with_context(|| format!("contact with peerstate.addr {:?} not found", &self.addr))?;

        let chats = Chatlist::try_load(context, 0, None, Some(contact_id)).await?;
-        let msg = match &change {
-            PeerstateChange::FingerprintChange => {
-                stock_str::contact_setup_changed(context, self.addr.clone()).await
-            }
-            PeerstateChange::Aeap(new_addr) => {
-                let old_contact = Contact::load_from_db(context, contact_id).await?;
-                stock_str::aeap_addr_changed(
-                    context,
-                    old_contact.get_display_name(),
-                    &self.addr,
-                    new_addr,
-                )
-                .await
-            }
-        };
        for (chat_id, msg_id) in chats.iter() {
+            let msg = match &change {
+                PeerstateChange::FingerprintChange => {
+                    stock_str::contact_setup_changed(context, self.addr.clone()).await
+                }
+                PeerstateChange::Aeap(new_addr) => {
+                    let old_contact = Contact::load_from_db(context, contact_id).await?;
+                    stock_str::aeap_addr_changed(
+                        context,
+                        old_contact.get_display_name(),
+                        &self.addr,
+                        new_addr,
+                    )
+                    .await
+                }
+            };
            let timestamp_sort = if let Some(msg_id) = msg_id {
                let lastmsg = Message::load_from_db(context, *msg_id).await?;
                lastmsg.timestamp_sort
@@ -546,23 +545,21 @@ impl Peerstate {
                    .await?
                    .unwrap_or(0)
            };
+            chat::add_info_msg_with_cmd(
+                context,
+                *chat_id,
+                &msg,
+                SystemMessage::Unknown,
+                timestamp_sort,
+                Some(timestamp),
+                None,
+                None,
+            )
+            .await?;

            if let PeerstateChange::Aeap(new_addr) = &change {
                let chat = Chat::load_from_db(context, *chat_id).await?;
-
-                if chat.typ == Chattype::Group && !chat.is_protected() {
-                    // Don't add an info_msg to the group, in order not to make the user think
-                    // that the address was automatically replaced in the group.
-                    continue;
-                }
-
-                // For security reasons, for now, we only do the AEAP transition if the fingerprint
-                // is verified (that's what from_verified_fingerprint_or_addr() does).
-                // In order to not have inconsistent group membership state, we then only do the
-                // transition in verified groups and in broadcast lists.
-                if (chat.typ == Chattype::Group && chat.is_protected())
-                    || chat.typ == Chattype::Broadcast
-                {
+                if chat.typ == Chattype::Group || chat.typ == Chattype::Broadcast {
                    chat::remove_from_chat_contacts_table(context, *chat_id, contact_id).await?;

                    let (new_contact_id, _) =
@@ -575,18 +572,6 @@ impl Peerstate {
                    context.emit_event(EventType::ChatModified(*chat_id));
                }
            }
-
-            chat::add_info_msg_with_cmd(
-                context,
-                *chat_id,
-                &msg,
-                SystemMessage::Unknown,
-                timestamp_sort,
-                Some(timestamp),
-                None,
-                None,
-            )
-            .await?;
        }

        Ok(())
@@ -612,7 +597,7 @@ impl Peerstate {
 /// In `drafts/aeap_mvp.md` there is a "big picture" overview over AEAP.
 pub async fn maybe_do_aeap_transition(
    context: &Context,
-    info: &mut DecryptionInfo,
+    info: &mut crate::e2ee::DecryptionInfo,
    mime_parser: &crate::mimeparser::MimeMessage,
 ) -> Result<()> {
    if let Some(peerstate) = &mut info.peerstate {
@@ -636,7 +621,7 @@ pub async fn maybe_do_aeap_transition(
                && mime_parser.from_is_signed
                && info.message_time > peerstate.last_seen
            {
-                // Add info messages to chats with this (verified) contact
+                // Add an info messages to all chats with this contact
                //
                peerstate
                    .handle_setup_change(
--- a/src/provider.rs
+++ b/src/provider.rs
@@ -9,7 +9,7 @@ use anyhow::Result;
 use chrono::{NaiveDateTime, NaiveTime};
 use trust_dns_resolver::{config, AsyncResolver, TokioAsyncResolver};

-#[derive(Debug, Display, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, Display, Copy, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Status {
    Ok = 1,
@@ -17,14 +17,14 @@ pub enum Status {
    Broken = 3,
 }

-#[derive(Debug, Display, PartialEq, Eq, Copy, Clone, FromPrimitive, ToPrimitive)]
+#[derive(Debug, Display, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Protocol {
    Smtp = 1,
    Imap = 2,
 }

-#[derive(Debug, Display, PartialEq, Eq, Copy, Clone, FromPrimitive, ToPrimitive)]
+#[derive(Debug, Display, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Socket {
    Automatic = 0,
@@ -39,21 +39,21 @@ impl Default for Socket {
    }
 }

-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Clone)]
 #[repr(u8)]
 pub enum UsernamePattern {
    Email = 1,
    Emaillocalpart = 2,
 }

-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 #[repr(u8)]
 pub enum Oauth2Authorizer {
    Yandex = 1,
    Gmail = 2,
 }

-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Server {
    pub protocol: Protocol,
    pub socket: Socket,
@@ -62,13 +62,13 @@ pub struct Server {
    pub username_pattern: UsernamePattern,
 }

-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 pub struct ConfigDefault {
    pub key: Config,
    pub value: &'static str,
 }

-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 pub struct Provider {
    /// Unique ID, corresponding to provider database filename.
    pub id: &'static str,
--- a/src/provider/data.rs
+++ b/src/provider/data.rs
@@ -9,32 +9,20 @@ use std::collections::HashMap;
 use once_cell::sync::Lazy;

 // 163.md: 163.com
-static P_163: Lazy<Provider> = Lazy::new(|| Provider {
+static P_163: Lazy<Provider> = Lazy::new(|| {
+    Provider {
    id: "163",
-    status: Status::Ok,
-    before_login_hint: "",
+    status: Status::Broken,
+    before_login_hint: "163 Mail does not work since it forces the email clients to connect with an IMAP ID, which is currently not the case of Delta Chat.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/163",
    server: vec![
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "imap.163.com",
-            port: 993,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "smtp.163.com",
-            port: 465,
-            username_pattern: Email,
-        },
    ],
    config_defaults: None,
    strict_tls: true,
    max_smtp_rcpt_to: None,
    oauth2_authorizer: None,
+}
 });

 // aktivix.org.md: aktivix.org
@@ -1891,4 +1879,4 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
 });

 pub static PROVIDER_UPDATED: Lazy<chrono::NaiveDate> =
-    Lazy::new(|| chrono::NaiveDate::from_ymd(2022, 7, 5));
+    Lazy::new(|| chrono::NaiveDate::from_ymd(2022, 6, 4));
--- a/src/provider/update.py
+++ b/src/provider/update.py
@@ -2,9 +2,9 @@
 # if the yaml import fails, run "pip install pyyaml"

 import sys
+import os
 import yaml
 import datetime
-from pathlib import Path

 out_all = ""
 out_domains = ""
@@ -24,7 +24,7 @@ def cleanstr(s):


 def file2id(f):
-    return f.stem
+    return os.path.basename(f).replace(".md", "")


 def file2varname(f):
@@ -141,7 +141,7 @@ def process_data(data, file):

    # finally, add the provider
    global out_all, out_domains, out_ids
-    out_all += "// " + file.name + ": " + comment.strip(", ") + "\n"
+    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
@@ -151,7 +151,7 @@ def process_data(data, file):


 def process_file(file):
-    print("processing file: {}".format(file), file=sys.stderr)
+    print("processing file: " + file, file=sys.stderr)
    with open(file) as f:
        # load_all() loads "---"-separated yamls -
        # by coincidence, this is also the frontmatter separator :)
@@ -160,10 +160,11 @@ def process_file(file):


 def process_dir(dir):
-    print("processing directory: {}".format(dir), file=sys.stderr)
-    files = sorted(f for f in dir.iterdir() if f.suffix == '.md')
+    print("processing directory: " + dir, file=sys.stderr)
+    files = [f for f in os.listdir(dir) if f.endswith(".md")]
+    files.sort()
    for f in files:
-        process_file(f)
+        process_file(os.path.join(dir, f))


 if __name__ == "__main__":
@@ -178,7 +179,7 @@ if __name__ == "__main__":
    "use std::collections::HashMap;\n\n"
    "use once_cell::sync::Lazy;\n\n")

-    process_dir(Path(sys.argv[1]))
+    process_dir(sys.argv[1])

    out_all += "pub(crate) static PROVIDER_DATA: Lazy<HashMap<&'static str, &'static Provider>> = Lazy::new(|| [\n"
    out_all += out_domains;
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -1,6 +1,6 @@
 //! # QR code module.

-use anyhow::{anyhow, bail, ensure, Context as _, Error, Result};
+use anyhow::{bail, ensure, Context as _, Error, Result};
 use once_cell::sync::Lazy;
 use percent_encoding::percent_decode_str;
 use serde::Deserialize;
@@ -14,8 +14,8 @@ use crate::context::Context;
 use crate::key::Fingerprint;
 use crate::message::Message;
 use crate::peerstate::Peerstate;
+use crate::token;
 use crate::tools::time;
-use crate::{token, EventType};

 const OPENPGP4FPR_SCHEME: &str = "OPENPGP4FPR:"; // yes: uppercase
 const DCACCOUNT_SCHEME: &str = "DCACCOUNT:";
@@ -27,7 +27,7 @@ const SMTP_SCHEME: &str = "SMTP:";
 const HTTP_SCHEME: &str = "http://";
 const HTTPS_SCHEME: &str = "https://";

-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Qr {
    AskVerifyContact {
        contact_id: ContactId,
@@ -61,7 +61,6 @@ pub enum Qr {
    },
    Addr {
        contact_id: ContactId,
-        draft: Option<String>,
    },
    Url {
        url: String,
@@ -344,14 +343,10 @@ fn decode_webrtc_instance(_context: &Context, qr: &str) -> Result<Qr> {
 }

 #[derive(Debug, Deserialize)]
-struct CreateAccountSuccessResponse {
+struct CreateAccountResponse {
    email: String,
    password: String,
 }
-#[derive(Debug, Deserialize)]
-struct CreateAccountErrorResponse {
-    reason: String,
-}

 /// take a qr of the type DC_QR_ACCOUNT, parse it's parameters,
 /// download additional information from the contained url and set the parameters.
@@ -359,42 +354,23 @@ struct CreateAccountErrorResponse {
 #[allow(clippy::indexing_slicing)]
 async fn set_account_from_qr(context: &Context, qr: &str) -> Result<()> {
    let url_str = &qr[DCACCOUNT_SCHEME.len()..];
-    let response = reqwest::Client::new().post(url_str).send().await?;
-    let response_status = response.status();
-    let response_text = response.text().await.with_context(|| {
-        format!(
-            "Cannot create account, request to {:?} failed: empty response",
-            url_str
-        )
-    })?;

-    if response_status.is_success() {
-        let CreateAccountSuccessResponse { password, email } = serde_json::from_str(&response_text)
-            .with_context(|| {
-                format!(
-                    "Cannot create account, response from {:?} is malformed:\n{:?}",
-                    url_str, response_text
-                )
-            })?;
-        context.set_config(Config::Addr, Some(&email)).await?;
-        context.set_config(Config::MailPw, Some(&password)).await?;
+    let parsed: CreateAccountResponse = reqwest::Client::new()
+        .post(url_str)
+        .send()
+        .await?
+        .json()
+        .await
+        .with_context(|| format!("Cannot create account, request to {:?} failed", url_str))?;

-        Ok(())
-    } else {
-        match serde_json::from_str::<CreateAccountErrorResponse>(&response_text) {
-            Ok(error) => Err(anyhow!(error.reason)),
-            Err(parse_error) => {
-                context.emit_event(EventType::Error(format!(
-                    "Cannot create account, server response could not be parsed:\n{:#}\nraw response:\n{}",
-                    parse_error, response_text
-                )));
-                bail!(
-                    "Cannot create account, unexpected server response:\n{:?}",
-                    response_text
-                )
-            }
-        }
-    }
+    context
+        .set_config(Config::Addr, Some(&parsed.email))
+        .await?;
+    context
+        .set_config(Config::MailPw, Some(&parsed.password))
+        .await?;
+
+    Ok(())
 }

 pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
@@ -475,52 +451,15 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
 async fn decode_mailto(context: &Context, qr: &str) -> Result<Qr> {
    let payload = &qr[MAILTO_SCHEME.len()..];

-    let (addr, query) = if let Some(query_index) = payload.find('?') {
-        (&payload[..query_index], &payload[query_index + 1..])
+    let addr = if let Some(query_index) = payload.find('?') {
+        &payload[..query_index]
    } else {
-        (payload, "")
-    };
-
-    let param: BTreeMap<&str, &str> = query
-        .split('&')
-        .filter_map(|s| {
-            if let [key, value] = s.splitn(2, '=').collect::<Vec<_>>()[..] {
-                Some((key, value))
-            } else {
-                None
-            }
-        })
-        .collect();
-
-    let subject = if let Some(subject) = param.get("subject") {
-        subject.to_string()
-    } else {
-        "".to_string()
-    };
-    let draft = if let Some(body) = param.get("body") {
-        if subject.is_empty() {
-            body.to_string()
-        } else {
-            subject + "\n" + body
-        }
-    } else {
-        subject
-    };
-    let draft = draft.replace('+', "%20"); // sometimes spaces are encoded as `+`
-    let draft = match percent_decode_str(&draft).decode_utf8() {
-        Ok(decoded_draft) => decoded_draft.to_string(),
-        Err(_err) => draft,
+        payload
    };

    let addr = normalize_address(addr)?;
    let name = "".to_string();
-    Qr::from_address(
-        context,
-        name,
-        addr,
-        if draft.is_empty() { None } else { Some(draft) },
-    )
-    .await
+    Qr::from_address(context, name, addr).await
 }

 /// Extract address for the smtp scheme.
@@ -538,7 +477,7 @@ async fn decode_smtp(context: &Context, qr: &str) -> Result<Qr> {

    let addr = normalize_address(addr)?;
    let name = "".to_string();
-    Qr::from_address(context, name, addr, None).await
+    Qr::from_address(context, name, addr).await
 }

 /// Extract address for the matmsg scheme.
@@ -563,7 +502,7 @@ async fn decode_matmsg(context: &Context, qr: &str) -> Result<Qr> {

    let addr = normalize_address(addr)?;
    let name = "".to_string();
-    Qr::from_address(context, name, addr, None).await
+    Qr::from_address(context, name, addr).await
 }

 static VCARD_NAME_RE: Lazy<regex::Regex> =
@@ -592,19 +531,14 @@ async fn decode_vcard(context: &Context, qr: &str) -> Result<Qr> {
        bail!("Bad e-mail address");
    };

-    Qr::from_address(context, name, addr, None).await
+    Qr::from_address(context, name, addr).await
 }

 impl Qr {
-    pub async fn from_address(
-        context: &Context,
-        name: String,
-        addr: String,
-        draft: Option<String>,
-    ) -> Result<Self> {
+    pub async fn from_address(context: &Context, name: String, addr: String) -> Result<Self> {
        let (contact_id, _) =
            Contact::add_or_lookup(context, &name, &addr, Origin::UnhandledQrScan).await?;
-        Ok(Qr::Addr { contact_id, draft })
+        Ok(Qr::Addr { contact_id })
    }
 }

@@ -685,13 +619,12 @@ mod tests {
            "BEGIN:VCARD\nVERSION:3.0\nN:Last;First\nEMAIL;TYPE=INTERNET:stress@test.local\nEND:VCARD"
        ).await?;

-        if let Qr::Addr { contact_id, draft } = qr {
+        if let Qr::Addr { contact_id } = qr {
            let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
            assert_eq!(contact.get_addr(), "stress@test.local");
            assert_eq!(contact.get_name(), "First Last");
            assert_eq!(contact.get_authname(), "");
            assert_eq!(contact.get_display_name(), "First Last");
-            assert!(draft.is_none());
        } else {
            bail!("Wrong QR code type");
        }
@@ -709,10 +642,9 @@ mod tests {
        )
        .await?;

-        if let Qr::Addr { contact_id, draft } = qr {
+        if let Qr::Addr { contact_id } = qr {
            let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
            assert_eq!(contact.get_addr(), "stress@test.local");
-            assert!(draft.is_none());
        } else {
            bail!("Wrong QR code type");
        }
@@ -726,22 +658,20 @@ mod tests {

        let qr = check_qr(
            &ctx.ctx,
-            "mailto:stress@test.local?subject=hello&body=beautiful+world",
+            "mailto:stress@test.local?subject=hello&body=world",
        )
        .await?;
-        if let Qr::Addr { contact_id, draft } = qr {
+        if let Qr::Addr { contact_id } = qr {
            let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
            assert_eq!(contact.get_addr(), "stress@test.local");
-            assert_eq!(draft.unwrap(), "hello\nbeautiful world");
        } else {
            bail!("Wrong QR code type");
        }

        let res = check_qr(&ctx.ctx, "mailto:no-questionmark@example.org").await?;
-        if let Qr::Addr { contact_id, draft } = res {
+        if let Qr::Addr { contact_id } = res {
            let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
            assert_eq!(contact.get_addr(), "no-questionmark@example.org");
-            assert!(draft.is_none());
        } else {
            bail!("Wrong QR code type");
        }
@@ -756,12 +686,11 @@ mod tests {
    async fn test_decode_smtp() -> Result<()> {
        let ctx = TestContext::new().await;

-        if let Qr::Addr { contact_id, draft } =
+        if let Qr::Addr { contact_id } =
            check_qr(&ctx.ctx, "SMTP:stress@test.local:subjecthello:bodyworld").await?
        {
            let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
            assert_eq!(contact.get_addr(), "stress@test.local");
-            assert!(draft.is_none());
        } else {
            bail!("Wrong QR code type");
        }
--- a/src/ratelimit.rs
+++ b/src/ratelimit.rs
@@ -51,7 +51,7 @@ impl Ratelimit {

    /// Returns true if it is allowed to send a message.
    fn can_send_at(&self, now: SystemTime) -> bool {
-        self.current_value_at(now) + 1.0 <= self.quota
+        self.current_value_at(now) <= self.quota
    }

    /// Returns true if can send another message now.
@@ -62,7 +62,7 @@ impl Ratelimit {
    }

    fn send_at(&mut self, now: SystemTime) {
-        self.current_value = f64::min(self.quota, self.current_value_at(now) + 1.0);
+        self.current_value = self.current_value_at(now) + 1.0;
        self.last_update = now;
    }

@@ -77,10 +77,10 @@ impl Ratelimit {

    fn until_can_send_at(&self, now: SystemTime) -> Duration {
        let current_value = self.current_value_at(now);
-        if current_value + 1.0 <= self.quota {
+        if current_value <= self.quota {
            Duration::ZERO
        } else {
-            let requirement = current_value + 1.0 - self.quota;
+            let requirement = current_value - self.quota;
            let rate = self.quota / self.window.as_secs_f64();
            Duration::from_secs_f64(requirement / rate)
        }
@@ -109,6 +109,8 @@ mod tests {
        ratelimit.send_at(now);
        assert!(ratelimit.can_send_at(now));
        ratelimit.send_at(now);
+        assert!(ratelimit.can_send_at(now));
+        ratelimit.send_at(now);

        // Can't send more messages now.
        assert!(!ratelimit.can_send_at(now));
@@ -123,8 +125,11 @@ mod tests {
        // Send one more message anyway, over quota.
        ratelimit.send_at(now);

-        // Always can send another message after 20 seconds,
-        // leaky bucket never overflows.
+        // Waiting 20 seconds is not enough.
+        let now = now + Duration::from_secs(20);
+        assert!(!ratelimit.can_send_at(now));
+
+        // Can send another message after 40 seconds.
        let now = now + Duration::from_secs(20);
        assert!(ratelimit.can_send_at(now));

--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -130,14 +130,15 @@ pub(crate) async fn receive_imf_inner(
                    context,
                    "Message already partly in DB, replacing by full message."
                );
-                Some(old_msg_id)
+                old_msg_id.delete_from_db(context).await?;
+                true
            } else {
                // the message was probably moved around.
                info!(context, "Message already in DB, doing nothing.");
                return Ok(None);
            }
        } else {
-            None
+            false
        };

    // the function returns the number of created messages in the database
@@ -188,9 +189,8 @@ pub(crate) async fn receive_imf_inner(
        sent_timestamp,
        rcvd_timestamp,
        from_id,
-        seen || replace_partial_download.is_some(),
+        seen || replace_partial_download,
        is_partial_download,
-        replace_partial_download,
        fetching_existing_messages,
        prevent_rename,
    )
@@ -322,7 +322,7 @@ pub(crate) async fn receive_imf_inner(
        }
    }

-    if replace_partial_download.is_some() {
+    if replace_partial_download {
        context.emit_msgs_changed(chat_id, MsgId::new(0));
    } else if !chat_id.is_trash() {
        let fresh = received_msg.state == MessageState::InFresh;
@@ -401,7 +401,6 @@ async fn add_parts(
    from_id: ContactId,
    seen: bool,
    is_partial_download: Option<u32>,
-    replace_msg_id: Option<MsgId>,
    fetching_existing_messages: bool,
    prevent_rename: bool,
 ) -> Result<ReceivedMsg> {
@@ -497,9 +496,9 @@ async fn add_parts(
            ChatIdBlocked::lookup_by_contact(context, from_id).await?
        };

-        if chat_id.is_none() && mime_parser.delivery_report.is_some() {
+        if chat_id.is_none() && mime_parser.failure_report.is_some() {
            chat_id = Some(DC_CHAT_ID_TRASH);
-            info!(context, "Message is a DSN (TRASH)",);
+            info!(context, "Message belongs to an NDN (TRASH)",);
        }

        if chat_id.is_none() {
@@ -1146,17 +1145,6 @@ INSERT INTO msgs
    }
    drop(conn);

-    if let Some(replace_msg_id) = replace_msg_id {
-        if let Some(created_msg_id) = created_db_entries.pop() {
-            context
-                .merge_messages(created_msg_id, replace_msg_id)
-                .await?;
-            created_db_entries.push(replace_msg_id);
-        } else {
-            replace_msg_id.delete_from_db(context).await?;
-        }
-    }
-
    chat_id.unarchive_if_not_muted(context).await?;

    info!(
@@ -2659,7 +2647,7 @@ mod tests {
            "shenauithz@testrun.org",
            "Mr.un2NYERi1RM.lbQ5F9q-QyJ@tiscali.it",
            include_bytes!("../test-data/message/tiscali_ndn.eml"),
-            Some("Delivery status notification –       This is an automatically generated Delivery Status Notification.      \n\nDelivery to the following recipients was aborted after 2 second(s):\n\n  * shenauithz@testrun.org"),
+            Some("Delivery to at least one recipient failed."),
        )
        .await;
    }
@@ -2736,32 +2724,6 @@ mod tests {
        .await;
    }

-    /// Tests that text part is not squashed into OpenPGP attachment.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_parse_ndn_with_attachment() {
-        test_parse_ndn(
-            "alice@example.org",
-            "bob@example.net",
-            "Mr.I6Da6dXcTel.TroC5J3uSDH@example.org",
-            include_bytes!("../test-data/message/ndn_with_attachment.eml"),
-            Some("Undelivered Mail Returned to Sender – This is the mail system at host relay01.example.org.\n\nI'm sorry to have to inform you that your message could not\nbe delivered to one or more recipients. It's attached below.\n\nFor further assistance, please send mail to postmaster.\n\nIf you do so, please include this problem report. You can\ndelete your own text from the attached returned message.\n\n                   The mail system\n\n<bob@example.net>: host mx2.example.net[80.241.60.215] said: 552 5.2.2\n    <bob@example.net>: Recipient address rejected: Mailbox quota exceeded (in\n    reply to RCPT TO command)\n\n<bob2@example.net>: host mx1.example.net[80.241.60.212] said: 552 5.2.2\n    <bob2@example.net>: Recipient address rejected: Mailbox quota\n    exceeded (in reply to RCPT TO command)")
-        )
-        .await;
-    }
-
-    /// Test that DSN is not treated as NDN if Action: is not "failed"
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_parse_dsn_relayed() {
-        test_parse_ndn(
-            "anon_1@posteo.de",
-            "anon_2@gmx.at",
-            "8b7b1a9d0c8cc588c7bcac47f5687634@posteo.de",
-            include_bytes!("../test-data/message/dsn_relayed.eml"),
-            None,
-        )
-        .await;
-    }
-
    // ndn = Non Delivery Notification
    async fn test_parse_ndn(
        self_addr: &str,
@@ -2811,14 +2773,7 @@ mod tests {
        receive_imf(&t, raw_ndn, false).await.unwrap();
        let msg = Message::load_from_db(&t, msg_id).await.unwrap();

-        assert_eq!(
-            msg.state,
-            if error_msg.is_some() {
-                MessageState::OutFailed
-            } else {
-                MessageState::OutDelivered
-            }
-        );
+        assert_eq!(msg.state, MessageState::OutFailed);

        assert_eq!(msg.error(), error_msg.map(|error| error.to_string()));
    }
@@ -2932,10 +2887,6 @@ mod tests {

        assert!(chat.is_mailing_list());
        assert!(chat.can_send(&t.ctx).await?);
-        assert_eq!(
-            chat.get_mailinglist_addr(),
-            "reply+elernshsetushoyseshetihseusaferuhsedtisneu@reply.github.com"
-        );
        assert_eq!(chat.name, "deltachat/deltachat-core-rust");
        assert_eq!(chat::get_chat_contacts(&t.ctx, chat_id).await?.len(), 1);

@@ -2943,7 +2894,6 @@ mod tests {

        let chat = chat::Chat::load_from_db(&t.ctx, chat_id).await?;
        assert!(!chat.can_send(&t.ctx).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");

        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await?;
        assert_eq!(chats.len(), 1);
@@ -3002,7 +2952,6 @@ mod tests {
        let chat = Chat::load_from_db(&t.ctx, chat_id).await.unwrap();
        assert_eq!(chat.name, "delta-dev");
        assert!(chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "delta@codespeak.net");

        let msg = get_chat_msg(&t, chat_id, 0, 1).await;
        let contact1 = Contact::load_from_db(&t.ctx, msg.from_id).await.unwrap();
@@ -3231,7 +3180,7 @@ Hello mailinglist!\r\n"
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_majordomo_mailing_list() -> Result<()> {
+    async fn test_majordomo_mailing_list() {
        let t = TestContext::new_alice().await;
        t.set_config(Config::ShowEmails, Some("2")).await.unwrap();

@@ -3258,8 +3207,6 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.grpid, "mylist@bar.org");
        assert_eq!(chat.name, "ola");
        assert_eq!(chat::get_chat_msgs(&t, chat.id, 0).await.unwrap().len(), 1);
-        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");

        // receive another message with no sender name but the same address,
        // make sure this lands in the same chat
@@ -3279,12 +3226,10 @@ Hello mailinglist!\r\n"
        .await
        .unwrap();
        assert_eq!(chat::get_chat_msgs(&t, chat.id, 0).await.unwrap().len(), 2);
-
-        Ok(())
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_mailchimp_mailing_list() -> Result<()> {
+    async fn test_mailchimp_mailing_list() {
        let t = TestContext::new_alice().await;
        t.set_config(Config::ShowEmails, Some("2")).await.unwrap();

@@ -3311,14 +3256,10 @@ Hello mailinglist!\r\n"
            "399fc0402f1b154b67965632e.100761.list-id.mcsv.net"
        );
        assert_eq!(chat.name, "Atlas Obscura");
-        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
-
-        Ok(())
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_dhl_mailing_list() -> Result<()> {
+    async fn test_dhl_mailing_list() {
        let t = TestContext::new_alice().await;
        t.set_config(Config::ShowEmails, Some("2")).await.unwrap();

@@ -3340,14 +3281,10 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.blocked, Blocked::Request);
        assert_eq!(chat.grpid, "1234ABCD-123LMNO.mailing.dhl.de");
        assert_eq!(chat.name, "DHL Paket");
-        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
-
-        Ok(())
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_dpd_mailing_list() -> Result<()> {
+    async fn test_dpd_mailing_list() {
        let t = TestContext::new_alice().await;
        t.set_config(Config::ShowEmails, Some("2")).await.unwrap();

@@ -3369,10 +3306,6 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.blocked, Blocked::Request);
        assert_eq!(chat.grpid, "dpdde.mxmail.service.dpd.de");
        assert_eq!(chat.name, "DPD");
-        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");
-
-        Ok(())
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -3390,8 +3323,6 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.typ, Chattype::Mailinglist);
        assert_eq!(chat.grpid, "96540.xt.local");
        assert_eq!(chat.name, "Microsoft Store");
-        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");

        receive_imf(
            &t,
@@ -3403,8 +3334,6 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.typ, Chattype::Mailinglist);
        assert_eq!(chat.grpid, "121231234.xt.local");
        assert_eq!(chat.name, "DER SPIEGEL Kundenservice");
-        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");

        Ok(())
    }
@@ -3426,8 +3355,6 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.typ, Chattype::Mailinglist);
        assert_eq!(chat.grpid, "51231231231231231231231232869f58.xing.com");
        assert_eq!(chat.name, "xing.com");
-        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), "");

        Ok(())
    }
--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -324,25 +324,29 @@ async fn smtp_loop(ctx: Context, started: Sender<()>, smtp_handlers: SmtpConnect

        let mut timeout = None;
        loop {
-            if let Err(err) = send_smtp_messages(&ctx, &mut connection).await {
-                warn!(ctx, "send_smtp_messages failed: {:#}", err);
-                timeout = Some(timeout.map_or(30, |timeout: u64| timeout.saturating_mul(3)))
-            } else {
-                let duration_until_can_send = ctx.ratelimit.read().await.until_can_send();
-                if !duration_until_can_send.is_zero() {
-                    info!(
-                        ctx,
-                        "smtp got rate limited, waiting for {} until can send again",
-                        duration_to_str(duration_until_can_send)
-                    );
-                    tokio::time::timeout(duration_until_can_send, async {
-                        idle_interrupt_receiver.recv().await.unwrap_or_default()
-                    })
-                    .await
-                    .unwrap_or_default();
-                    continue;
+            match send_smtp_messages(&ctx, &mut connection).await {
+                Err(err) => {
+                    warn!(ctx, "send_smtp_messages failed: {:#}", err);
+                    timeout = Some(timeout.map_or(30, |timeout: u64| timeout.saturating_mul(3)))
+                }
+                Ok(ratelimited) => {
+                    if ratelimited {
+                        let duration_until_can_send = ctx.ratelimit.read().await.until_can_send();
+                        info!(
+                            ctx,
+                            "smtp got rate limited, waiting for {} until can send again",
+                            duration_to_str(duration_until_can_send)
+                        );
+                        tokio::time::timeout(duration_until_can_send, async {
+                            idle_interrupt_receiver.recv().await.unwrap_or_default()
+                        })
+                        .await
+                        .unwrap_or_default();
+                        continue;
+                    } else {
+                        timeout = None;
+                    }
                }
-                timeout = None;
            }

            // Fake Idle
--- a/src/securejoin/bobstate.rs
+++ b/src/securejoin/bobstate.rs
@@ -342,19 +342,20 @@ impl BobState {
                true
            }
            QrInvite::Group { ref grpid, .. } => {
-                // This is buggy, result will always be
+                // This is buggy, is_verified_group will always be
                // false since the group is created by receive_imf for
                // the very handshake message we're handling now.  But
                // only after we have returned.  It does not impact
                // the security invariants of secure-join however.

-                chat::get_chat_id_by_grpid(context, grpid)
+                let is_verified_group = chat::get_chat_id_by_grpid(context, grpid)
                    .await?
-                    .map_or(false, |(_chat_id, is_protected, _blocked)| is_protected)
+                    .map_or(false, |(_chat_id, is_protected, _blocked)| is_protected);
                // when joining a non-verified group
                // the vg-member-added message may be unencrypted
                // when not all group members have keys or prefer encryption.
                // So only expect encryption if this is a verified group
+                is_verified_group
            }
        };
        if vg_expect_encrypted
@@ -500,7 +501,7 @@ impl BobHandshakeMsg {
 }

 /// The next message expected by [`BobState`] in the setup-contact/secure-join protocol.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum SecureJoinStep {
    /// Expecting the auth-required message.
    ///
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -477,17 +477,21 @@ pub(crate) async fn send_msg_to_smtp(
 }

 /// Attempts to send queued MDNs.
-async fn send_mdns(context: &Context, connection: &mut Smtp) -> Result<()> {
+///
+/// Returns true if there are more MDNs to send, but rate limiter does not
+/// allow to send them. Returns false if there are no more MDNs to send.
+/// If sending an MDN fails, returns an error.
+async fn send_mdns(context: &Context, connection: &mut Smtp) -> Result<bool> {
    loop {
        if !context.ratelimit.read().await.can_send() {
            info!(context, "Ratelimiter does not allow sending MDNs now");
-            return Ok(());
+            return Ok(true);
        }

        let more_mdns = send_mdn(context, connection).await?;
        if !more_mdns {
            // No more MDNs to send.
-            return Ok(());
+            return Ok(false);
        }
    }
 }
@@ -496,8 +500,10 @@ async fn send_mdns(context: &Context, connection: &mut Smtp) -> Result<()> {
 ///
 /// Logs and ignores SMTP errors to ensure that a single SMTP message constantly failing to be sent
 /// does not block other messages in the queue from being sent.
-pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp) -> Result<()> {
-    let ratelimited = if context.ratelimit.read().await.can_send() {
+///
+/// Returns true if sending was ratelimited, false otherwise. Errors are propagated to the caller.
+pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp) -> Result<bool> {
+    let mut ratelimited = if context.ratelimit.read().await.can_send() {
        // add status updates and sync messages to end of sending queue
        context.flush_status_updates().await?;
        context.send_sync_msg().await?;
@@ -532,11 +538,12 @@ pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp)
    // do not attempt to send MDNs if ratelimited happend before on status-updates/sync:
    // instead, let the caller recall this function so that more important status-updates/sync are sent out.
    if !ratelimited {
-        send_mdns(context, connection)
+        ratelimited = send_mdns(context, connection)
            .await
            .context("failed to send MDNs")?;
    }
-    Ok(())
+
+    Ok(ratelimited)
 }

 /// Tries to send MDN for message `msg_id` to `contact_id`.
--- a/src/stock_str.rs
+++ b/src/stock_str.rs
@@ -335,11 +335,6 @@ pub enum StockMessage {

    #[strum(props(fallback = "%1$s changed their address from %2$s to %3$s"))]
    AeapAddrChanged = 122,
-
-    #[strum(props(
-        fallback = "You changed your email address from %1$s to %2$s.\n\nIf you now send a message to a verified group, contacts there will automatically replace the old with your new address.\n\nIt's highly advised to set up your old email provider to forward all emails to your new email address. Otherwise you might miss messages of contacts who did not get your new address yet."
-    ))]
-    AeapExplanationAndLink = 123,
 }

 impl StockMessage {
@@ -1109,17 +1104,6 @@ pub(crate) async fn aeap_addr_changed(
        .replace3(new_addr)
 }

-pub(crate) async fn aeap_explanation_and_link(
-    context: &Context,
-    old_addr: impl AsRef<str>,
-    new_addr: impl AsRef<str>,
-) -> String {
-    translated(context, StockMessage::AeapExplanationAndLink)
-        .await
-        .replace1(old_addr)
-        .replace2(new_addr)
-}
-
 impl Context {
    /// Set the stock string for the [StockMessage].
    ///
--- a/src/tests/aeap.rs
+++ b/src/tests/aeap.rs
@@ -184,11 +184,9 @@ async fn check_aeap_transition(
    let already_new_contact = Contact::create(&bob, "Alice", "fiona@example.net")
        .await
        .unwrap();
-    if verified {
-        chat::add_contact_to_chat(&bob, groups[2], already_new_contact)
-            .await
-            .unwrap();
-    }
+    chat::add_contact_to_chat(&bob, groups[0], already_new_contact)
+        .await
+        .unwrap();

    // groups 0 and 2 stay unpromoted (i.e. local
    // on Bob's device, Alice doesn't know about them)
@@ -221,7 +219,7 @@ async fn check_aeap_transition(

    tcm.section("Check that the AEAP transition worked");
    check_that_transition_worked(
-        &groups[2..],
+        &groups,
        &alice,
        "alice@example.org",
        ALICE_NEW_ADDR,
@@ -229,7 +227,6 @@ async fn check_aeap_transition(
        &bob,
    )
    .await;
-    check_no_transition_done(&groups[0..2], "alice@example.org", &bob).await;

    // Assert that the autocrypt header is also applied to the peerstate
    // if the address changed
@@ -249,7 +246,7 @@ async fn check_aeap_transition(
    assert_eq!(recvd.text.unwrap(), "Hello from my old addr!");

    check_that_transition_worked(
-        &groups[2..],
+        &groups,
        &alice,
        // Note that "alice@example.org" and ALICE_NEW_ADDR are switched now:
        ALICE_NEW_ADDR,
@@ -277,19 +274,11 @@ async fn check_that_transition_worked(
        let members = chat::get_chat_contacts(bob, *group).await.unwrap();
        // In all the groups, exactly Bob and Alice's new number are members.
        // (and Alice's new number isn't in there twice)
-        assert_eq!(
-            members.len(),
-            2,
-            "Group {} has members {:?}, but should have members {:?} and {:?}",
-            group,
-            &members,
-            new_contact,
-            ContactId::SELF
-        );
+        assert_eq!(members.len(), 2);
        assert!(members.contains(&new_contact));
        assert!(members.contains(&ContactId::SELF));

-        let info_msg = get_last_info_msg(bob, *group).await.unwrap();
+        let info_msg = get_last_info_msg(bob, *group).await;
        let expected_text =
            stock_str::aeap_addr_changed(bob, name, old_alice_addr, new_alice_addr).await;
        assert_eq!(info_msg.text.unwrap(), expected_text);
@@ -302,36 +291,6 @@ async fn check_that_transition_worked(
    }
 }

-async fn check_no_transition_done(groups: &[ChatId], old_alice_addr: &str, bob: &TestContext) {
-    let old_contact = Contact::lookup_id_by_addr(bob, old_alice_addr, contact::Origin::Unknown)
-        .await
-        .unwrap()
-        .unwrap();
-
-    for group in groups {
-        let members = chat::get_chat_contacts(bob, *group).await.unwrap();
-        // In all the groups, exactly Bob and Alice's _old_ number are members.
-        assert_eq!(
-            members.len(),
-            2,
-            "Group {} has members {:?}, but should have members {:?} and {:?}",
-            group,
-            &members,
-            old_contact,
-            ContactId::SELF
-        );
-        assert!(members.contains(&old_contact));
-        assert!(members.contains(&ContactId::SELF));
-
-        let last_info_msg = get_last_info_msg(bob, *group).await;
-        assert!(
-            last_info_msg.is_none(),
-            "{:?} shouldn't be there (or it's an unrelated info msg)",
-            last_info_msg
-        );
-    }
-}
-
 async fn mark_as_verified(this: &TestContext, other: &TestContext) {
    let other_addr = other.get_primary_self_addr().await.unwrap();
    let mut peerstate = peerstate::Peerstate::from_addr(this, &other_addr)
@@ -346,16 +305,16 @@ async fn mark_as_verified(this: &TestContext, other: &TestContext) {
    peerstate.save_to_db(&this.sql, false).await.unwrap();
 }

-async fn get_last_info_msg(t: &TestContext, chat_id: ChatId) -> Option<Message> {
+async fn get_last_info_msg(t: &TestContext, chat_id: ChatId) -> Message {
    let msgs = chat::get_chat_msgs(&t.ctx, chat_id, constants::DC_GCM_INFO_ONLY)
        .await
        .unwrap();
-    let msg_id = if let chat::ChatItem::Message { msg_id } = msgs.last()? {
+    let msg_id = if let chat::ChatItem::Message { msg_id } = msgs.last().unwrap() {
        msg_id
    } else {
-        return None;
+        panic!("Wrong item type");
    };
-    Some(Message::load_from_db(&t.ctx, *msg_id).await.unwrap())
+    Message::load_from_db(&t.ctx, *msg_id).await.unwrap()
 }

 /// Test that an attacker - here Fiona - can't replay a message sent by Alice
--- a/src/webxdc.rs
+++ b/src/webxdc.rs
@@ -1,7 +1,7 @@
 //! # Handle webxdc messages.

 use std::convert::TryFrom;
-use std::path::Path;
+use std::path::PathBuf;

 use anyhow::{anyhow, bail, ensure, format_err, Result};
 use deltachat_derive::FromSql;
@@ -14,7 +14,6 @@ use tokio::io::AsyncReadExt;
 use crate::chat::Chat;
 use crate::contact::ContactId;
 use crate::context::Context;
-use crate::download::DownloadState;
 use crate::message::{Message, MessageState, MsgId, Viewtype};
 use crate::mimeparser::SystemMessage;
 use crate::param::Param;
@@ -171,7 +170,7 @@ impl Context {

    /// ensure that a file is an acceptable webxdc for sending
    /// (sending has more strict size limits).
-    pub(crate) async fn ensure_sendable_webxdc_file(&self, path: &Path) -> Result<()> {
+    pub(crate) async fn ensure_sendable_webxdc_file(&self, path: &PathBuf) -> Result<()> {
        let filename = path.to_str().unwrap_or_default();
        if !filename.ends_with(WEBXDC_SUFFIX) {
            bail!("{} is not a valid webxdc file", filename);
@@ -331,12 +330,10 @@ impl Context {

        let status_update_serial = StatusUpdateSerial(u32::try_from(rowid)?);

-        if instance.viewtype == Viewtype::Webxdc {
-            self.emit_event(EventType::WebxdcStatusUpdate {
-                msg_id: instance.id,
-                status_update_serial,
-            });
-        }
+        self.emit_event(EventType::WebxdcStatusUpdate {
+            msg_id: instance.id,
+            status_update_serial,
+        });

        Ok(status_update_serial)
    }
@@ -478,8 +475,6 @@ impl Context {
        } else if let Some(parent) = msg.parent(self).await? {
            if parent.viewtype == Viewtype::Webxdc {
                (msg.timestamp_sort, parent, true)
-            } else if parent.download_state() != DownloadState::Done {
-                (msg.timestamp_sort, parent, false)
            } else {
                bail!("receive_status_update: message is not the child of a webxdc message.")
            }
@@ -735,7 +730,7 @@ mod tests {
    use crate::chatlist::Chatlist;
    use crate::config::Config;
    use crate::contact::Contact;
-    use crate::receive_imf::{receive_imf, receive_imf_inner};
+    use crate::receive_imf::receive_imf;
    use crate::test_utils::TestContext;

    use super::*;
@@ -1043,71 +1038,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_webxdc_update_for_not_downloaded_instance() -> Result<()> {
-        // Alice sends a larger instance and an update
-        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
-        let chat = alice.create_chat(&bob).await;
-        bob.set_config(Config::DownloadLimit, Some("40000")).await?;
-        let mut alice_instance = create_webxdc_instance(
-            &alice,
-            "chess.xdc",
-            include_bytes!("../test-data/webxdc/chess.xdc"),
-        )
-        .await?;
-        let sent1 = alice.send_msg(chat.id, &mut alice_instance).await;
-        let alice_instance = Message::load_from_db(&alice, sent1.sender_msg_id).await?;
-        alice
-            .send_webxdc_status_update(
-                alice_instance.id,
-                r#"{"payload": 7, "summary":"sum", "document":"doc"}"#,
-                "bla",
-            )
-            .await?;
-        alice.flush_status_updates().await?;
-        let sent2 = alice.pop_sent_msg().await;
-
-        // Bob does not download instance but already receives update
-        receive_imf_inner(
-            &bob,
-            &alice_instance.rfc724_mid,
-            sent1.payload().as_bytes(),
-            false,
-            Some(70790),
-            false,
-        )
-        .await?;
-        let bob_instance = bob.get_last_msg().await;
-        bob_instance.chat_id.accept(&bob).await?;
-        bob.recv_msg(&sent2).await;
-        assert_eq!(bob_instance.download_state, DownloadState::Available);
-
-        // Bob downloads instance, updates should be assigned correctly
-        receive_imf_inner(
-            &bob,
-            &alice_instance.rfc724_mid,
-            sent1.payload().as_bytes(),
-            false,
-            None,
-            false,
-        )
-        .await?;
-        let bob_instance = bob.get_last_msg().await;
-        assert_eq!(bob_instance.viewtype, Viewtype::Webxdc);
-        assert_eq!(bob_instance.download_state, DownloadState::Done);
-        assert_eq!(
-            bob.get_webxdc_status_updates(bob_instance.id, StatusUpdateSerial(0))
-                .await?,
-            r#"[{"payload":7,"document":"doc","summary":"sum","serial":1,"max_serial":1}]"#
-        );
-        let info = bob_instance.get_webxdc_info(&bob).await?;
-        assert_eq!(info.document, "doc");
-        assert_eq!(info.summary, "sum");
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_delete_webxdc_instance() -> Result<()> {
        let t = TestContext::new_alice().await;
--- a/test-data/message/dsn_relayed.eml
+++ b/test-data/message/dsn_relayed.eml
@@ -1,109 +0,0 @@
-Return-Path: <>
-Delivered-To: anon_1@posteo.de
-Received: from proxy02.posteo.name ([127.0.0.1])
-	by dovecot16.posteo.name (Dovecot) with LMTP id 4LJTJKBpxGClSAAAchYRkQ
-	for <anon_1@posteo.de>; Sat, 12 Jun 2021 10:42:09 +0200
-Received: from proxy02.posteo.de ([127.0.0.1])
-	by proxy02.posteo.name (Dovecot) with LMTP id 0NENMHNXxGDI4AIAGFAyLg
-	; Sat, 12 Jun 2021 10:42:09 +0200
-Received: from mailin02.posteo.de (unknown [10.0.0.62])
-	by proxy02.posteo.de (Postfix) with ESMTPS id 4G2B686dbVz11xc
-	for <anon_1@posteo.de>; Sat, 12 Jun 2021 10:42:08 +0200 (CEST)
-Received: from mx01.posteo.de (mailin02.posteo.de [127.0.0.1])
-	by mailin02.posteo.de (Postfix) with ESMTPS id AC2472152F
-	for <anon_1@posteo.de>; Sat, 12 Jun 2021 10:42:08 +0200 (CEST)
-X-Virus-Scanned: amavisd-new at posteo.de
-X-Spam-Flag: NO
-X-Spam-Score: -1
-X-Spam-Level: 
-X-Spam-Status: No, score=-1 tagged_above=-1000 required=7
-	tests=[ALL_TRUSTED=-1] autolearn=disabled
-X-Posteo-Antispam-Signature: v=1; e=base64; a=aes-256-gcm; d=7/8PYiypR3F6lmk8rQGNxZgmuPRJI9wU2IwnCWX1fg/nFdbPrDu9pCFSVsnrK1SjAWJJ9HtJVYECbeMxMhq9tOMxZf1nSN2cM/XXzeH6ELaaQfOWfQbBff3ZIe+rix/CF1uWX164
-Authentication-Results: posteo.de; dmarc=none (p=none dis=none) header.from=mout02.posteo.de
-X-Posteo-TLS-Received-Status: TLSv1.3
-Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66])
-	by mx01.posteo.de (Postfix) with ESMTPS id 4G2B676wGBz10Wt
-	for <anon_1@posteo.at>; Sat, 12 Jun 2021 10:42:07 +0200 (CEST)
-Received: by mout02.posteo.de (Postfix)
-	id A9F481A0089; Sat, 12 Jun 2021 10:42:07 +0200 (CEST)
-Date: Sat, 12 Jun 2021 10:42:07 +0200 (CEST)
-From: MAILER-DAEMON@mout02.posteo.de (Mail Delivery System)
-Subject: Successful Mail Delivery Report
-To: anon_1@posteo.at
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
-	boundary="56E6D1A007F.1623487327/mout02.posteo.de"
-Content-Transfer-Encoding: 7bit
-Message-Id: <20210612084207.A9F481A0089@mout02.posteo.de>
-
-This is a MIME-encapsulated message.
-
--56E6D1A007F.1623487327/mout02.posteo.de
-Content-Description: Notification
-Content-Type: text/plain; charset=us-ascii
-
-This is the mail system at host mout02.posteo.de.
-
-Your message was successfully delivered to the destination(s)
-listed below. If the message was delivered to mailbox you will
-receive no further notifications. Otherwise you may still receive
-notifications of mail delivery errors from other systems.
-
-                   The mail system
-
-<anon_2@gmx.at>: delivery via mx00.emig.gmx.net[212.227.15.9]:25: 250
-    Requested mail action okay, completed: id=1M9ohD-1lvXys2NFd-005r3O
-
--56E6D1A007F.1623487327/mout02.posteo.de
-Content-Description: Delivery report
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; mout02.posteo.de
-X-Postfix-Queue-ID: 56E6D1A007F
-X-Postfix-Sender: rfc822; anon_1@posteo.at
-Arrival-Date: Sat, 12 Jun 2021 10:42:07 +0200 (CEST)
-
-Final-Recipient: rfc822; anon_2@gmx.at
-Original-Recipient: rfc822;anon_2@gmx.at
-Action: relayed
-Status: 2.0.0
-Remote-MTA: dns; mx00.emig.gmx.net
-Diagnostic-Code: smtp; 250 Requested mail action okay, completed:
-    id=1M9ohD-1lvXys2NFd-005r3O
-
--56E6D1A007F.1623487327/mout02.posteo.de
-Content-Description: Message Headers
-Content-Type: text/rfc822-headers
-
-Return-Path: <anon_1@posteo.at>
-Received: from mout02.posteo.de (unknown [10.0.0.66])
-	by mout02.posteo.de (Postfix) with ESMTPS id 56E6D1A007F
-	for <anon_2@gmx.at>; Sat, 12 Jun 2021 10:42:07 +0200 (CEST)
-Received: from submission-encrypt01.posteo.de (unknown [10.0.0.75])
-	by mout02.posteo.de (Postfix) with ESMTPS id 1C39E2400FD
-	for <anon_2@gmx.at>; Sat, 12 Jun 2021 10:42:07 +0200 (CEST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.at; s=2017;
-	t=1623487327; bh=+ZIKEoFCh8N5xYBj6tMbfqiyHmay76uM4H4bfme6VyU=;
-	h=Date:From:To:Subject:From;
-	b=QK6HwDU2YEzzTgHN2PRT2lPaf5uwC7ZJ1Y0QMSUrEyvJxwPj6+z6OoEqRDcgQcGVo
-	 biAO2aKyBX+YCFwM5a6CaJotv8DaL+hn/XLk3RKqxGKTu5cBLQXJc0gjfRMel7LnBg
-	 i0UxTeOqoTw2anWTonH2GnseUPtVAhi23UICVD6gC6DchuNYF/YloMltns5HMGthQh
-	 z279J05txneSKgpbU/R3fN2v5ACEve7X6GoxM0hDZRNmAur0HAxAREc9xIaHwQ3zXM
-	 dEGFyO53s+UzLlOFnY4vhGVI3AiyOZUProq6vX40g9e4TkrIJMGd1pyKG4NdajauuY
-	 KTIwbUiR5Y2Xw==
-Received: from customer (localhost [127.0.0.1])
-	by submission (posteo.de) with ESMTPSA id 4G2B665xBPz6tmH
-	for <anon_2@gmx.at>; Sat, 12 Jun 2021 10:42:06 +0200 (CEST)
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="=_d0190a7dc3b70a1dcf12785779aad292"
-Date: Sat, 12 Jun 2021 08:42:06 +0000
-From: Anon_1 <anon_1@posteo.at>
-To: Anon_2 <anon_2@gmx.at>
-Subject: Hallo
-Message-ID: <8b7b1a9d0c8cc588c7bcac47f5687634@posteo.de>
-Posteo-User: anon_1@posteo.de
-Posteo-Dkim: ok
-
--56E6D1A007F.1623487327/mout02.posteo.de--
--- a/test-data/message/ndn_with_attachment.eml
+++ b/test-data/message/ndn_with_attachment.eml
@@ -1,123 +0,0 @@
-Return-Path: <>
-Delivered-To: <alice@example.org>
-Date: Sat, 25 Jun 2022 21:35:33 -0400 (CDT)
-From: MAILER-DAEMON@example.org (Mail Delivery System)
-Subject: Undelivered Mail Returned to Sender
-To: alice@example.org
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
-	boundary="C06EAE01B0.1656207333/relay01.example.org"
-Content-Transfer-Encoding: 7bit
-Message-Id: <20220626013533.5F0E5E0180@relay01.example.org>
-
-This is a MIME-encapsulated message.
-
--C06EAE01B0.1656207333/relay01.example.org
-Content-Description: Notification
-Content-Type: text/plain; charset=us-ascii
-
-This is the mail system at host relay01.example.org.
-
-I'm sorry to have to inform you that your message could not
-be delivered to one or more recipients. It's attached below.
-
-For further assistance, please send mail to postmaster.
-
-If you do so, please include this problem report. You can
-delete your own text from the attached returned message.
-
-                   The mail system
-
-<bob@example.net>: host mx2.example.net[80.241.60.215] said: 552 5.2.2
-    <bob@example.net>: Recipient address rejected: Mailbox quota exceeded (in
-    reply to RCPT TO command)
-
-<bob2@example.net>: host mx1.example.net[80.241.60.212] said: 552 5.2.2
-    <bob2@example.net>: Recipient address rejected: Mailbox quota
-    exceeded (in reply to RCPT TO command)
-
--C06EAE01B0.1656207333/relay01.example.org
-Content-Description: Delivery report
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; relay01.example.org
-X-Postfix-Queue-ID: C06EAE01B0
-X-Postfix-Sender: rfc822; alice@example.org
-Arrival-Date: Sat, 25 Jun 2022 21:35:23 -0400 (CDT)
-
-Final-Recipient: rfc822; bob@example.org
-Original-Recipient: rfc822;bob@example.org
-Action: failed
-Status: 5.2.2
-Remote-MTA: dns; mx2.example.net
-Diagnostic-Code: smtp; 552 5.2.2 <bob@example.org>: Recipient address
-    rejected: Mailbox quota exceeded
-
-Final-Recipient: rfc822; bob2@example.net
-Original-Recipient: rfc822;bob2@example.net
-Action: failed
-Status: 5.2.2
-Remote-MTA: dns; mx1.example.net
-Diagnostic-Code: smtp; 552 5.2.2 <bob2@example.net>: Recipient address
-    rejected: Mailbox quota exceeded
-
--C06EAE01B0.1656207333/relay01.example.org
-Content-Description: Undelivered Message
-Content-Type: message/rfc822
-Content-Transfer-Encoding: 7bit
-
-Return-Path: <alice@example.org>
-Received: from smtp-gw01.enet.cu (unknown [172.29.8.31])
-	by relay01.example.org (Postfix) with ESMTP id C06EAE01B0;
-	Sat, 25 Jun 2022 21:35:23 -0400 (CDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=example.org; s=nauta;
-	t=1656207323; bh=c0t8muX/2spIAQ/MRxSXsZ/ljSWP8uTxPcM5fqYC6qg=;
-	h=Subject:From:To:Date:In-Reply-To:References;
-	b=fggUmxnR3RjNfxO4S460fvxfenu3eUPvsGjldIGQeApxT508qGctJZ0tzYiFelOAu
-	 4zL8+VhlX0KdnrvRXo2/00O9U2kM8gpRLE9tIR0Rn6FyWM4nU5rcvAJp3oiUWxYzPt
-	 NMlzFeUsBvwFCJCEmZllSHaAyt/HTvWe68sGQsu8=
-Received: from amavis4.example.org (unknown [172.29.8.235])
-	by smtp-gw01.enet.cu (Postfix) with ESMTP id ECFE9180004D;
-	Sat, 25 Jun 2022 21:35:18 -0400 (CDT)
-Received: from smtp.example.org ([172.29.8.248])
-	by amavis4.example.org  with ESMTP id 25Q1ZNDW016368-25Q1ZNDX016368;
-	Sat, 25 Jun 2022 21:35:23 -0400
-Received: from [127.0.0.1] (unknown [10.59.196.114])
-	by smtp.example.org (Postfix) with ESMTPSA id E07E79F110;
-	Sat, 25 Jun 2022 21:35:21 -0400 (CDT)
-Subject: ...
-From: Alice <alice@example.org>
-To: <bob@example.net>, <bob2@example.net>
-Date: Sun, 26 Jun 2022 01:35:20 +0000
-Message-ID: <Mr.I6Da6dXcTel.TroC5J3uSDH@example.org>
-In-Reply-To: <Mr.I6Da6dXcTel.-qoK1IWpqby@example.org>
-References: <Mr.I6Da6dXcTel.TroC5J3uSDH@example.org>
-Chat-Version: 1.0
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; protocol="application/pgp-encrypted";
-	boundary="OOGjcgxCkv3w8d1thY6jg0b8O0NFJE"
-
-
--OOGjcgxCkv3w8d1thY6jg0b8O0NFJE
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
-
--OOGjcgxCkv3w8d1thY6jg0b8O0NFJE
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc";
-
-----BEGIN PGP MESSAGE-----
-
-REMOVED
-----END PGP MESSAGE-----
-
-
--OOGjcgxCkv3w8d1thY6jg0b8O0NFJE--
-
-
--C06EAE01B0.1656207333/relay01.example.org--
Author	SHA1	Message	Date
Franz Heinzmann (Frando)	7147d32601	fix	2022-07-15 16:24:04 +02:00
Franz Heinzmann (Frando)	343bb34589	Fix rename	2022-07-15 15:49:42 +02:00
Franz Heinzmann (Frando)	361b7f5b69	Add API versioning to the JSON-RPC API	2022-07-15 14:51:28 +02:00
Simon Laux	15019ce02b	use camelCase in all js object properties	2022-07-15 13:48:32 +02:00
Simon Laux	7bb5dc4c3c	add `chat_get_media` to jsonrpc also add viewtype wrapper enum and use it in `MessageObject`, additionally to using it in `chat_get_media`	2022-07-09 17:30:55 +02:00
Simon Laux	543edac105	add webxdc methods to jsonrpc: - `webxdc_send_status_update` - `webxdc_get_status_updates` - `message_get_webxdc_info`	2022-07-09 17:02:11 +02:00
Simon Laux	55db8d1fe0	jsonrpc: add dm_chat_contact to ChatListItemFetchResult	2022-07-05 15:55:40 +02:00
Simon Laux	1d92f06834	jsonrpc: add `get_fresh_msgs` and `get_fresh_msg_cnt`	2022-07-05 15:55:40 +02:00
Simon Laux	2ff05c9dff	add `add_device_message` to jsonrpc	2022-07-05 15:55:40 +02:00
Simon Laux	d6b6d96e21	add set_config_from_qr to jsonrpc	2022-07-05 15:55:40 +02:00
Simon Laux	8776767a44	make dcn_json_rpc_request return undefined instead of not returning this might have been the cause for the second segfault	2022-07-05 15:55:40 +02:00
Simon Laux	9d83057a71	remove print from test	2022-07-05 15:55:40 +02:00
Simon Laux	8ce11ac62f	found another segfault: this time in batch_set_config	2022-07-05 15:55:40 +02:00
Simon Laux	918ec85767	restore same configure behaviour as desktop: make configure restart io with the old configuration if it had one on error	2022-07-05 15:55:40 +02:00
Simon Laux	f3a9ab6d23	fix the typos thanks to ralphtheninja for finding them	2022-07-05 15:55:40 +02:00
Franz Heinzmann (Frando)	e4def6a44d	Increase online test timeouts for CI	2022-07-05 15:55:40 +02:00
Simon Laux	4b5c194ef3	make sure to use dc_str_unref instead of free on cstrings returned/owned by rust	2022-07-05 15:55:40 +02:00
Simon Laux	97e2d85b28	Update deltachat-ffi/deltachat.h Co-authored-by: bjoern <r10s@b44t.com>	2022-07-05 15:55:40 +02:00
Simon Laux	81bc7bd7bf	Update deltachat-ffi/deltachat.h Co-authored-by: bjoern <r10s@b44t.com>	2022-07-05 15:55:40 +02:00
Simon Laux	f53c456e50	remove unneeded context thanks to link2xt for pointing that out	2022-07-05 15:55:40 +02:00
Simon Laux	64fa5675a9	reintroduce segfault test script	2022-07-05 15:55:40 +02:00
Simon Laux	1f0bdfa704	apply link2xt's suggestions: - unref jsonrpc_instance in same thread it was created in - increase `max_queue_size` from 1 to 1000	2022-07-05 15:55:40 +02:00
Simon Laux	5ac347b7ae	make it more idiomatic: rename `ContactObject::from_dc_contact -> `ContactObject::try_from_dc_contact`	2022-07-05 15:55:40 +02:00
Simon Laux	40fa2d4120	adress dig's comments - description in cargo.toml - impl From<EventType> for EventTypeName - rename `CommandApi::new_from_arc` -> `CommandApi::from_arc` - pre-allocate if we know the entry count already - remove unused enumerate - remove unused serde attribute comment - rename `FullChat::from_dc_chat_id` -> `FullChat::try_from_dc_chat_id`	2022-07-05 15:55:40 +02:00
Franz Heinzmann (Frando)	aaf27e4434	fix docs	2022-07-05 15:55:40 +02:00
Franz Heinzmann (Frando)	2df10857ca	Improve documentation	2022-07-05 15:55:40 +02:00
Franz Heinzmann (Frando)	7eae3a1072	Naming consistency: Use DeltaChat not Deltachat	2022-07-05 15:55:40 +02:00
Franz Heinzmann (Frando)	7fc162543a	Improve JSON-RPC CI, no need to build things multiple times	2022-07-05 15:55:40 +02:00
Franz Heinzmann (Frando)	e7da0672ae	Fix method name casings and cleanups	2022-07-05 15:55:38 +02:00
Simon Laux	69d9d48ae4	changelog entry about the jsonrpc	2022-07-05 15:54:31 +02:00
Franz Heinzmann (Frando)	802677222b	remove debug logs	2022-07-05 15:54:00 +02:00
Simon Laux	d7b9febc33	update todo document remove specific api stuff for now, we now have the an incremental aproach on moving not the all at-once effort I though it would be	2022-07-05 15:54:00 +02:00
Franz Heinzmann (Frando)	1d347f7369	Bump yerpc to 0.3.1 with fix for axum server	2022-07-05 15:53:58 +02:00
Franz Heinzmann (Frando)	e3fa42fe88	don't wait for IO on webserver start	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	2f00b098ac	improve test setup and code style	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	bdd4aa0f10	use multi-threaded runtime in JSON-RPC webserver	2022-07-05 15:50:03 +02:00
Simon Laux	6fee4fd878	expose anyhow errors feature name was wrong	2022-07-05 15:50:03 +02:00
Simon Laux	60d3a3cacf	remove emtpy file allow unused code for new_from_arc	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	4bb1980f8d	try to fix ci	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	35b70b1d1b	fix ci	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	fd53b80c17	use stable toolchain not 1.56.0	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	978e4aec82	Fix CFFI for JSON-RPC changes	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	329f498651	improve docs, fix example	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	035e208e4f	Improve docs.	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	3404996fdd	Improvements to typescript package	2022-07-05 15:50:03 +02:00
Franz Heinzmann (Frando)	97e0e0137a	Changes for tokio compat, upgrade to yerpc 0.3 This also changes the webserver binary to use axum in place of tide.	2022-07-05 15:49:59 +02:00
Simon Laux	659e48bd3f	improve naming	2022-07-05 15:36:45 +02:00
Simon Laux	271d54e420	commit types.ts that dc-node has everything it needs to provide @deltachat/jsonrpc-client without an extra ts compile step	2022-07-05 15:36:45 +02:00
Simon Laux	9984ee5eb2	add @deltachat/jsonrpc-client to make sure its dependencies are installed, too whwn installing dc-node	2022-07-05 15:36:45 +02:00
Simon Laux	136bec0273	disable jsonrpc by default	2022-07-05 15:36:45 +02:00
Simon Laux	c5ff7427be	put jsonrpc stuff in own module	2022-07-05 15:36:45 +02:00
Simon Laux	2319dfc3eb	remove selectAccount from highlevel client	2022-07-05 15:36:45 +02:00
Simon Laux	d8d26b9cae	activate other tests again	2022-07-05 15:36:45 +02:00
Simon Laux	d93622bc84	fix closing segfault thanks again to link2xt for figguring this out	2022-07-05 15:36:45 +02:00
Simon Laux	2fde4962a1	break loop on empty response	2022-07-05 15:36:45 +02:00
Simon Laux	29a5d73f94	call a jsonrpc function in segfault example	2022-07-05 15:36:45 +02:00
Simon Laux	b51814aaaa	add jsonrpc feature flag	2022-07-05 15:36:45 +02:00
Simon Laux	63e7179191	add jsonrpc crate to set_core_version	2022-07-05 15:36:45 +02:00
Simon Laux	9915803252	add some files to npm ignore that don't need to be in the npm package	2022-07-05 15:36:45 +02:00
Simon Laux	e12aeb7bd8	add json api to cffi and expose it in dc node	2022-07-05 15:36:45 +02:00
Simon Laux	346fab7f26	fix compile after rebase	2022-07-05 15:36:45 +02:00
Simon Laux	6f6e6f24c9	change now returns event names as id directly, no conversion method or number ids anymore also longer timeout for requesting test accounts from mailadm	2022-07-05 15:36:45 +02:00
Simon Laux	079cd67da8	update .gitignore	2022-07-05 15:36:44 +02:00
Simon Laux	bfd97fdb05	fix formatting make test pass fix clippy	2022-07-05 15:36:44 +02:00
Simon Laux	688326f21c	refactor function name	2022-07-05 15:36:44 +02:00
Simon Laux	cc20d25b8d	fix get_provider_info docs	2022-07-05 15:36:44 +02:00
Simon Laux	99d50615c3	use node 16 in ci use `npm i` instead of `npm ci` try fix ci script and fix a doc comment	2022-07-05 15:36:44 +02:00
Simon Laux	a006825376	fix clippy	2022-07-05 15:36:44 +02:00
Simon Laux	c90fd1c9ce	get target dir from cargo	2022-07-05 15:36:44 +02:00
Simon Laux	bf5d09e74a	integrate json-rpc repo https://github.com/deltachat/deltachat-jsonrpc	2022-07-05 15:36:44 +02:00