use unlikely() hint instead of forcing an index

.github/workflows/deltachat-rpc-server.yml

@@ -248,10 +248,6 @@ jobs:
           cp result/*.whl dist/
           nix build .#deltachat-rpc-server-win32-wheel
           cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-arm64-v8a-android-wheel
-          cp result/*.whl dist/
-          nix build .#deltachat-rpc-server-armeabi-v7a-android-wheel
-          cp result/*.whl dist/
           nix build .#deltachat-rpc-server-source
           cp result/*.tar.gz dist/
           python3 scripts/wheel-rpc-server.py x86_64-darwin bin/deltachat-rpc-server-x86_64-macos

.github/workflows/jsonrpc.yml

@@ -37,6 +37,9 @@ jobs:
         run: npm run test
         env:
           CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+      - name: make sure websocket server version still builds
+        working-directory: deltachat-jsonrpc
+        run: cargo build --bin deltachat-jsonrpc-server --features webserver
       - name: Run linter
         working-directory: deltachat-jsonrpc/typescript
         run: npm run prettier:check

.github/workflows/nix.yml

@@ -55,9 +55,7 @@ jobs:
           - deltachat-rpc-server-aarch64-linux
           - deltachat-rpc-server-aarch64-linux-wheel
           - deltachat-rpc-server-arm64-v8a-android
-          - deltachat-rpc-server-arm64-v8a-android-wheel
           - deltachat-rpc-server-armeabi-v7a-android
-          - deltachat-rpc-server-armeabi-v7a-android-wheel
           - deltachat-rpc-server-armv6l-linux
           - deltachat-rpc-server-armv6l-linux-wheel
           - deltachat-rpc-server-armv7l-linux

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Bug reports
 
-If you found a bug, [report it on GitHub](https://github.com/chatmail/core/issues).
+If you found a bug, [report it on GitHub](https://github.com/deltachat/deltachat-core-rust/issues).
 If the bug you found is specific to
 [Android](https://github.com/deltachat/deltachat-android/issues),
 [iOS](https://github.com/deltachat/deltachat-ios/issues) or
@@ -67,7 +67,7 @@ If you want to contribute a code, follow this guide.
    BREAKING CHANGE: You have to call `dc_stop_io()`/`dc_start_io()` before/after `dc_imex(DC_IMEX_EXPORT_BACKUP)`
    ```
 
-4. [**Open a Pull Request**](https://github.com/chatmail/core/pulls).
+4. [**Open a Pull Request**](https://github.com/deltachat/deltachat-core-rust/pulls).
 
    Refer to the corresponding issue.
 
@@ -116,7 +116,7 @@ For other ways to contribute, refer to the [website](https://delta.chat/en/contr
 
 You can find the list of good first issues
 and a link to this guide
-on the contributing page: <https://github.com/chatmail/core/contribute>
+on the contributing page: <https://github.com/deltachat/deltachat-core-rust/contribute>
 
 [Conventional Commits]: https://www.conventionalcommits.org/
 [git-cliff]: https://git-cliff.org/

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "deltachat"
-version = "1.157.3"
+version = "1.156.1"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.81"
-repository = "https://github.com/chatmail/core"
+repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [profile.dev]
 debug = 0
@@ -41,7 +41,7 @@ ratelimit = { path = "./deltachat-ratelimit" }
 anyhow = { workspace = true }
 async-broadcast = "0.7.2"
 async-channel = { workspace = true }
-async-imap = { version = "0.10.3", default-features = false, features = ["runtime-tokio", "compress"] }
+async-imap = { version = "0.10.2", default-features = false, features = ["runtime-tokio", "compress"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.10", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.17", default-features = false, features = ["deflate", "tokio-fs"] }
@@ -50,24 +50,25 @@ brotli = { version = "7", default-features=false, features = ["std"] }
 bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
 data-encoding = "2.7.0"
+encoded-words = "0.2"
 escaper = "0.1"
 fast-socks5 = "0.10"
 fd-lock = "4"
 futures-lite = { workspace = true }
 futures = { workspace = true }
 hex = "0.4.0"
-hickory-resolver = "=0.25.0-alpha.5"
+hickory-resolver = "=0.25.0-alpha.4"
 http-body-util = "0.1.2"
 humansize = "2"
 hyper = "1"
 hyper-util = "0.1.10"
 image = { version = "0.25.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.33", default-features = false, features = ["net"] }
-iroh = { version = "0.33", default-features = false }
+iroh-gossip = { version = "0.32", default-features = false, features = ["net"] }
+iroh = { version = "0.32", default-features = false }
 kamadak-exif = "0.6.1"
 libc = { workspace = true }
-mail-builder = { version = "0.4.2", default-features = false }
-mailparse = { workspace = true }
+mail-builder = { git = "https://github.com/stalwartlabs/mail-builder", branch = "main", default-features = false }
+mailparse = "0.16.1"
 mime = "0.3.17"
 num_cpus = "1.16"
 num-derive = "0.4"
@@ -93,14 +94,14 @@ serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
 shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
-smallvec = "1.14.0"
-strum = "0.27"
-strum_macros = "0.27"
+smallvec = "1.13.2"
+strum = "0.26"
+strum_macros = "0.26"
 tagger = "4.3.4"
 textwrap = "0.16.1"
 thiserror = { workspace = true }
 tokio-io-timeout = "1.2.0"
-tokio-rustls = { version = "0.26.2", default-features = false }
+tokio-rustls = { version = "0.26.1", default-features = false }
 tokio-stream = { version = "0.1.17", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = { workspace = true }
@@ -109,7 +110,7 @@ toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 webpki-roots = "0.26.8"
-blake3 = "1.6.1"
+blake3 = "1.5.5"
 
 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
@@ -134,7 +135,6 @@ members = [
   "deltachat-time",
   "format-flowed",
   "deltachat-contact-tools",
-  "fuzz",
 ]
 
 [[bench]]
@@ -174,7 +174,7 @@ harness = false
 anyhow = "1"
 async-channel = "2.3.1"
 base64 = "0.22"
-chrono = { version = "0.4.40", default-features = false }
+chrono = { version = "0.4.39", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
 deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
 deltachat = { path = ".", default-features = false }
@@ -182,7 +182,6 @@ futures = "0.3.31"
 futures-lite = "2.6.0"
 libc = "0.2"
 log = "0.4"
-mailparse = "0.16.1"
 nu-ansi-term = "0.46"
 num-traits = "0.2"
 once_cell = "1.20.2"

README.md

@@ -3,11 +3,11 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/chatmail/core/actions/workflows/ci.yml">
-    <img alt="Rust CI" src="https://github.com/chatmail/core/actions/workflows/ci.yml/badge.svg">
+  <a href="https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml">
+    <img alt="Rust CI" src="https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml/badge.svg">
   </a>
-  <a href="https://deps.rs/repo/github/chatmail/core">
-    <img alt="dependency status" src="https://deps.rs/repo/github/chatmail/core/status.svg">
+  <a href="https://deps.rs/repo/github/deltachat/deltachat-core-rust">
+    <img alt="dependency status" src="https://deps.rs/repo/github/deltachat/deltachat-core-rust/status.svg">
   </a>
 </p>
 
@@ -104,7 +104,7 @@ For more commands type:
 ## Installing libdeltachat system wide
 
 ```
-$ git clone https://github.com/chatmail/core.git
+$ git clone https://github.com/deltachat/deltachat-core-rust.git
 $ cd deltachat-core-rust
 $ cmake -B build . -DCMAKE_INSTALL_PREFIX=/usr
 $ cmake --build build

RELEASE.md

@@ -2,12 +2,12 @@
 
 For example, to release version 1.116.0 of the core, do the following steps.
 
-1. Resolve all [blocker issues](https://github.com/chatmail/core/labels/blocker).
+1. Resolve all [blocker issues](https://github.com/deltachat/deltachat-core-rust/labels/blocker).
 
 2. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
 
 3. add a link to compare previous with current version to the end of CHANGELOG.md:
-  `[1.116.0]: https://github.com/chatmail/core/compare/v1.115.2...v1.116.0`
+  `[1.116.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.115.2...v1.116.0`
 
 4. Update the version by running `scripts/set_core_version.py 1.116.0`.
 

cliff.toml

@@ -11,7 +11,7 @@ filter_unconventional = false
 split_commits = false
 # regex for preprocessing the commit messages
 commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/chatmail/core/pull/${2}))"}, # replace pull request / issue numbers
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/deltachat/deltachat-core-rust/pull/${2}))"}, # replace pull request / issue numbers
 ]
 # regex for parsing and grouping commits
 commit_parsers = [
@@ -82,11 +82,11 @@ footer = """
     {% if release.version -%}
         {% if release.previous.version -%}
             [{{ release.version | trim_start_matches(pat="v") }}]: \
-                https://github.com/chatmail/core\
+                https://github.com/deltachat/deltachat-core-rust\
                     /compare/{{ release.previous.version }}..{{ release.version }}
         {% endif -%}
     {% else -%}
-        [unreleased]: https://github.com/chatmail/core\
+        [unreleased]: https://github.com/deltachat/deltachat-core-rust\
             /compare/{{ release.previous.version }}..HEAD
     {% endif -%}
 {% endfor %}

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.157.3"
+version = "1.156.1"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"

deltachat-ffi/deltachat.h

@@ -220,7 +220,7 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
  * - Strings in function arguments or return values are usually UTF-8 encoded.
  *
  * - The issue-tracker for the core library is here:
- *   <https://github.com/chatmail/core/issues>
+ *   <https://github.com/deltachat/deltachat-core-rust/issues>
  *
  * If you need further assistance,
  * please do not hesitate to contact us
@@ -440,6 +440,17 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    also show all mails of confirmed contacts,
  *                    DC_SHOW_EMAILS_ALL (2)=
  *                    also show mails of unconfirmed contacts (default).
+ * - `key_gen_type` = DC_KEY_GEN_DEFAULT (0)=
+ *                    generate recommended key type (default),
+ *                    DC_KEY_GEN_RSA2048 (1)=
+ *                    generate RSA 2048 keypair
+ *                    DC_KEY_GEN_ED25519 (2)=
+ *                    generate Curve25519 keypair
+ *                    DC_KEY_GEN_RSA4096 (3)=
+ *                    generate RSA 4096 keypair
+ * - `save_mime_headers` = 1=save mime headers
+ *                    and make dc_get_mime_headers() work for subsequent calls,
+ *                    0=do not save mime headers (default)
  * - `delete_device_after` = 0=do not delete messages from device automatically (default),
  *                    >=1=seconds, after which messages are deleted automatically from the device.
  *                    Messages in the "saved messages" chat (see dc_chat_is_self_talk()) are skipped.
@@ -1949,6 +1960,23 @@ char*           dc_get_msg_html              (dc_context_t* context, uint32_t ms
 void dc_download_full_msg (dc_context_t* context, int msg_id);
 
 
+/**
+ * Get the raw mime-headers of the given message.
+ * Raw headers are saved for incoming messages
+ * only if `dc_set_config(context, "save_mime_headers", "1")`
+ * was called before.
+ *
+ * @memberof dc_context_t
+ * @param context The context object.
+ * @param msg_id The message ID, must be the ID of an incoming message.
+ * @return Raw headers as a multi-line string, must be released using dc_str_unref() after usage.
+ *     Returns NULL if there are no headers saved for the given message,
+ *     e.g. because of save_mime_headers is not set
+ *     or the message is not incoming.
+ */
+char*           dc_get_mime_headers          (dc_context_t* context, uint32_t msg_id);
+
+
 /**
  * Delete messages. The messages are deleted on all devices and
  * on the IMAP server.
@@ -2512,14 +2540,11 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   ask the user if they want to create an account on the given domain,
  *   if so, call dc_set_config_from_qr() and then dc_configure().
  *
+ * - DC_QR_BACKUP:
  * - DC_QR_BACKUP2:
  *   ask the user if they want to set up a new device.
  *   If so, pass the qr-code to dc_receive_backup().
  *
- * - DC_QR_BACKUP_TOO_NEW:
- *   show a hint to the user that this backup comes from a newer Delta Chat version
- *   and this device needs an update
- *
  * - DC_QR_WEBRTC_INSTANCE with dc_lot_t::text1=domain:
  *   ask the user if they want to use the given service for video chats;
  *   if so, call dc_set_config_from_qr().
@@ -6286,18 +6311,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED 2021
 
 
-/**
- * Chat was deleted.
- * This event is emitted in response to dc_delete_chat()
- * called on this or another device.
- * The event is a good place to remove notifications or homescreen shortcuts.
- *
- * @param data1 (int) chat_id
- * @param data2 (int) 0
- */
-#define DC_EVENT_CHAT_DELETED             2023
-
-
 /**
  * Contact(s) created, renamed, verified, blocked or deleted.
  *
@@ -6538,6 +6551,15 @@ void dc_event_unref(dc_event_t* event);
 #define DC_MEDIA_QUALITY_WORSE    1
 
 
+/*
+ * Values for dc_get|set_config("key_gen_type")
+ */
+#define DC_KEY_GEN_DEFAULT 0
+#define DC_KEY_GEN_RSA2048 1
+#define DC_KEY_GEN_ED25519 2
+#define DC_KEY_GEN_RSA4096 3
+
+
 /**
  * @defgroup DC_PROVIDER_STATUS DC_PROVIDER_STATUS
  *

deltachat-ffi/src/lib.rs

@@ -544,7 +544,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::MsgDeleted { .. } => 2016,
         EventType::ChatModified(_) => 2020,
         EventType::ChatEphemeralTimerModified { .. } => 2021,
-        EventType::ChatDeleted { .. } => 2023,
         EventType::ContactsChanged(_) => 2030,
         EventType::LocationChanged(_) => 2035,
         EventType::ConfigureProgress { .. } => 2041,
@@ -611,8 +610,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::MsgRead { chat_id, .. }
         | EventType::MsgDeleted { chat_id, .. }
         | EventType::ChatModified(chat_id)
-        | EventType::ChatEphemeralTimerModified { chat_id, .. }
-        | EventType::ChatDeleted { chat_id } => chat_id.to_u32() as libc::c_int,
+        | EventType::ChatEphemeralTimerModified { chat_id, .. } => chat_id.to_u32() as libc::c_int,
         EventType::ContactsChanged(id) | EventType::LocationChanged(id) => {
             let id = id.unwrap_or_default();
             id.to_u32() as libc::c_int
@@ -678,7 +676,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::AccountsItemChanged
         | EventType::ConfigSynced { .. }
         | EventType::ChatModified(_)
-        | EventType::ChatDeleted { .. }
         | EventType::WebxdcRealtimeAdvertisementReceived { .. }
         | EventType::EventChannelOverflow { .. } => 0,
         EventType::MsgsChanged { msg_id, .. }
@@ -770,7 +767,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::WebxdcInstanceDeleted { .. }
         | EventType::AccountsBackgroundFetchDone
         | EventType::ChatEphemeralTimerModified { .. }
-        | EventType::ChatDeleted { .. }
         | EventType::IncomingMsgBunch { .. }
         | EventType::ChatlistItemChanged { .. }
         | EventType::ChatlistChanged
@@ -1658,7 +1654,6 @@ pub unsafe extern "C" fn dc_get_chat(context: *mut dc_context_t, chat_id: u32) -
         return ptr::null_mut();
     }
     let ctx = &*context;
-    let context: Context = ctx.clone();
 
     block_on(async move {
         match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
@@ -1954,6 +1949,28 @@ pub unsafe extern "C" fn dc_get_msg_html(
         .strdup()
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_get_mime_headers(
+    context: *mut dc_context_t,
+    msg_id: u32,
+) -> *mut libc::c_char {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_get_mime_headers()");
+        return ptr::null_mut(); // NULL explicitly defined as "no mime headers"
+    }
+    let ctx = &*context;
+
+    block_on(async move {
+        let mime = message::get_mime_headers(ctx, MsgId::new(msg_id))
+            .await
+            .unwrap_or_log_default(ctx, "failed to get mime headers");
+        if mime.is_empty() {
+            return ptr::null_mut();
+        }
+        mime.strdup()
+    })
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_delete_msgs(
     context: *mut dc_context_t,
@@ -2983,7 +3000,7 @@ pub unsafe extern "C" fn dc_chatlist_get_context(
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
 pub struct ChatWrapper {
-    context: Context,
+    context: *const dc_context_t,
     chat: chat::Chat,
 }
 
@@ -3050,13 +3067,14 @@ pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut
         return ptr::null_mut(); // NULL explicitly defined as "no image"
     }
     let ffi_chat = &*chat;
+    let ctx = &*ffi_chat.context;
 
     block_on(async move {
-        match ffi_chat.chat.get_profile_image(&ffi_chat.context).await {
+        match ffi_chat.chat.get_profile_image(ctx).await {
             Ok(Some(p)) => p.to_string_lossy().strdup(),
             Ok(None) => ptr::null_mut(),
             Err(err) => {
-                error!(ffi_chat.context, "failed to get profile image: {err:#}");
+                error!(ctx, "failed to get profile image: {err:#}");
                 ptr::null_mut()
             }
         }
@@ -3070,9 +3088,9 @@ pub unsafe extern "C" fn dc_chat_get_color(chat: *mut dc_chat_t) -> u32 {
         return 0;
     }
     let ffi_chat = &*chat;
+    let ctx = &*ffi_chat.context;
 
-    block_on(ffi_chat.chat.get_color(&ffi_chat.context))
-        .unwrap_or_log_default(&ffi_chat.context, "Failed get_color")
+    block_on(ffi_chat.chat.get_color(ctx)).unwrap_or_log_default(ctx, "Failed get_color")
 }
 
 #[no_mangle]
@@ -3136,9 +3154,10 @@ pub unsafe extern "C" fn dc_chat_can_send(chat: *mut dc_chat_t) -> libc::c_int {
         return 0;
     }
     let ffi_chat = &*chat;
-    block_on(ffi_chat.chat.can_send(&ffi_chat.context))
+    let ctx = &*ffi_chat.context;
+    block_on(ffi_chat.chat.can_send(ctx))
         .context("can_send failed")
-        .log_err(&ffi_chat.context)
+        .log_err(ctx)
         .unwrap_or_default() as libc::c_int
 }
 

deltachat-jsonrpc/Cargo.toml

@@ -1,17 +1,23 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.157.3"
+version = "1.156.1"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
+default-run = "deltachat-jsonrpc-server"
 license = "MPL-2.0"
-repository = "https://github.com/chatmail/core"
+repository = "https://github.com/deltachat/deltachat-core-rust"
+
+[[bin]]
+name = "deltachat-jsonrpc-server"
+path = "src/webserver.rs"
+required-features = ["webserver"]
 
 [dependencies]
 anyhow = { workspace = true }
 deltachat = { workspace = true }
 deltachat-contact-tools = { workspace = true }
 num-traits = { workspace = true }
-schemars = "0.8.22"
+schemars = "0.8.21"
 serde = { workspace = true, features = ["derive"] }
 tempfile = { workspace = true }
 log = { workspace = true }
@@ -25,10 +31,15 @@ sanitize-filename = { workspace = true }
 walkdir = "2.5.0"
 base64 = { workspace = true }
 
+# optional dependencies
+axum = { version = "0.7", optional = true, features = ["ws"] }
+env_logger = { version = "0.11.6", optional = true }
+
 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
 
 
 [features]
 default = ["vendored"]
+webserver = ["dep:env_logger", "dep:axum", "tokio/full", "yerpc/support-axum"]
 vendored = ["deltachat/vendored"]

deltachat-jsonrpc/README.md

@@ -4,16 +4,46 @@ This crate provides a [JSON-RPC 2.0](https://www.jsonrpc.org/specification) inte
 
 The JSON-RPC API is exposed in two fashions:
 
-* A executable `deltachat-rpc-server` that exposes the JSON-RPC API through stdio.
-* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). It exposes the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
+* A executable that exposes the JSON-RPC API through a [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) server running on localhost.
+* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). The C FFI needs to be built with the `jsonrpc` feature. It will then expose the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
 
-We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder.
+We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder. The client can easily be used with the WebSocket server to build DeltaChat apps for web browsers or Node.js. See the [examples](typescript/example) for details.
 
 ## Usage
 
+#### Running the WebSocket server
+
+From within this folder, you can start the WebSocket server with the following command:
+
+```sh
+cargo run --features webserver
+```
+
+If you want to use the server in a production setup, first build it in release mode:
+
+```sh
+cargo build --features webserver --release
+```
+You will then find the `deltachat-jsonrpc-server` executable in your `target/release` folder.
+
+The executable currently does not support any command-line arguments. By default, once started it will accept WebSocket connections on `ws://localhost:20808/ws`. It will store the persistent configuration and databases in a `./accounts` folder relative to the directory from where it is started.
+
+The server can be configured with environment variables:
+
+|variable|default|description|
+|-|-|-|
+|`DC_PORT`|`20808`|port to listen on|
+|`DC_ACCOUNTS_PATH`|`./accounts`|path to storage directory|
+
+If you are targeting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):
+
+```sh
+cross build --features=webserver --target armv7-linux-androideabi --release
+```
+
 #### Using the TypeScript/JavaScript client
 
-The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/chatmail/yerpc)). Find the source in the [`typescript`](typescript) folder. 
+The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/Frando/yerpc/)). Find the source in the [`typescript`](typescript) folder. 
 
 To use it locally, first install the dependencies and compile the TypeScript code to JavaScript:
 ```sh
@@ -22,7 +52,15 @@ npm install
 npm run build
 ```
 
-The JavaScript client is [published on NPM](https://www.npmjs.com/package/@deltachat/jsonrpc-client).
+The JavaScript client is not yet published on NPM (but will likely be soon). Currently, it is recommended to vendor the bundled build. After running `npm run build` as documented above, there will be a file `dist/deltachat.bundle.js`. This is an ESM module containing all dependencies. Copy this file to your project and import the DeltaChat class.
+
+
+```typescript
+import { DeltaChat } from './deltachat.bundle.js'
+const dc = new DeltaChat('ws://localhost:20808/ws')
+const accounts = await dc.rpc.getAllAccounts()
+console.log('accounts', accounts)
+```
 
 A script is included to build autogenerated documentation, which includes all RPC methods:
 ```sh
@@ -35,6 +73,18 @@ Then open the [`typescript/docs`](typescript/docs) folder in a web browser.
 
 #### Running the example app
 
+We include a small demo web application that talks to the WebSocket server. It can be used for testing. Feel invited to expand this.
+
+```sh
+cd typescript
+npm run build
+npm run example:build
+npm run example:start
+```
+Then, open [`http://localhost:8080/example.html`](http://localhost:8080/example.html) in a web browser.
+
+Run `npm run example:dev` to live-rebuild the example app when files changes.
+
 ### Testing
 
 The crate includes both a basic Rust smoke test and more featureful integration tests that use the TypeScript client.
@@ -54,12 +104,14 @@ cd typescript
 npm run test
 ```
 
-This will build the `deltachat-jsonrpc-server` binary and then run a test suite.
+This will build the `deltachat-jsonrpc-server` binary and then run a test suite against the WebSocket server.
 
-The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
+The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, talk to DeltaChat developers to get a token for the `testrun.org` service, or use a local instance of [`mailadm`](https://github.com/deltachat/docker-mailadm).
+
+Then, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
 
 ```
-CHATMAIL_DOMAIN=ci-chatmail.testrun.org npm run test
+CHATMAIL_DOMAIN=chat.example.org npm run test
 ```
 
 #### Test Coverage

deltachat-jsonrpc/TODO.md

@@ -0,0 +1,28 @@
+# TODO
+
+- [ ] different test type to simulate two devices: to test autocrypt_initiate_key_transfer & autocrypt_continue_key_transfer
+
+## MVP - Websocket server&client
+
+For kaiOS and other experiments, like a deltachat "web" over network from an android phone.
+
+- [ ] coverage for a majority of the API
+- [ ] Blobs served
+- [ ] Blob upload (for attachments, setting profile-picture, importing backup and so on)
+- [ ] other way blobs can be addressed when using websocket vs. jsonrpc over dc-node
+- [ ] Web push API? At least some kind of notification hook closure this lib can accept.
+
+### Other Ideas for the Websocket server
+
+- [ ] make sure there can only be one connection at a time to the ws
+  - why? , it could give problems if its commanded from multiple connections
+- [ ] encrypted connection?
+- [ ] authenticated connection?
+- [ ] Look into unit-testing for the proc macros?
+- [ ] proc macro taking over doc comments to generated typescript file
+
+## Desktop Apis
+
+Incomplete todo for desktop api porting, just some remainders for points that might need more work:
+
+- [ ] manual start/stop io functions in the api for context and accounts, so "not syncing all accounts" can still be done in desktop -> webserver should then not do start io on all accounts by default

deltachat-jsonrpc/src/api.rs

@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::str;
 use std::sync::Arc;
 use std::time::Duration;
@@ -7,7 +7,6 @@ use std::{collections::HashMap, str::FromStr};
 
 use anyhow::{anyhow, bail, ensure, Context, Result};
 pub use deltachat::accounts::Accounts;
-use deltachat::blob::BlobObject;
 use deltachat::chat::{
     self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, get_chat_msgs_ex,
     marknoticed_chat, remove_contact_from_chat, Chat, ChatId, ChatItem, MessageListOptions,
@@ -22,7 +21,7 @@ use deltachat::ephemeral::Timer;
 use deltachat::location;
 use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
-    self, delete_msgs_ex, markseen_msgs, Message, MessageState, MsgId, Viewtype,
+    self, delete_msgs, markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
 use deltachat::peer_channels::{
     leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
@@ -39,7 +38,6 @@ use deltachat::{imex, info};
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
-use types::login_param::EnteredLoginParam;
 use walkdir::WalkDir;
 use yerpc::rpc;
 
@@ -343,19 +341,11 @@ impl CommandApi {
         ctx.get_info().await
     }
 
-    /// Get the blob dir.
     async fn get_blob_dir(&self, account_id: u32) -> Result<Option<String>> {
         let ctx = self.get_context(account_id).await?;
         Ok(ctx.get_blobdir().to_str().map(|s| s.to_owned()))
     }
 
-    /// Copy file to blob dir.
-    async fn copy_to_blob_dir(&self, account_id: u32, path: String) -> Result<PathBuf> {
-        let ctx = self.get_context(account_id).await?;
-        let file = Path::new(&path);
-        Ok(BlobObject::create_and_deduplicate(&ctx, file, file)?.to_abs_path())
-    }
-
     async fn draft_self_report(&self, account_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         Ok(ctx.draft_self_report().await?.to_u32())
@@ -432,9 +422,6 @@ impl CommandApi {
 
     /// Configures this account with the currently set parameters.
     /// Setup the credential config before calling this.
-    ///
-    /// Deprecated as of 2025-02; use `add_transport_from_qr()`
-    /// or `add_transport()` instead.
     async fn configure(&self, account_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         ctx.stop_io().await;
@@ -449,69 +436,6 @@ impl CommandApi {
         Ok(())
     }
 
-    /// Configures a new email account using the provided parameters
-    /// and adds it as a transport.
-    ///
-    /// If the email address is the same as an existing transport,
-    /// then this existing account will be reconfigured instead of a new one being added.
-    ///
-    /// This function stops and starts IO as needed.
-    ///
-    /// Usually it will be enough to only set `addr` and `imap.password`,
-    /// and all the other settings will be autoconfigured.
-    ///
-    /// During configuration, ConfigureProgress events are emitted;
-    /// they indicate a successful configuration as well as errors
-    /// and may be used to create a progress bar.
-    /// This function will return after configuration is finished.
-    ///
-    /// If configuration is successful,
-    /// the working server parameters will be saved
-    /// and used for connecting to the server.
-    /// The parameters entered by the user will be saved separately
-    /// so that they can be prefilled when the user opens the server-configuration screen again.
-    ///
-    /// See also:
-    /// - [Self::is_configured()] to check whether there is
-    ///   at least one working transport.
-    /// - [Self::add_transport_from_qr()] to add a transport
-    ///   from a server encoded in a QR code.
-    /// - [Self::list_transports()] to get a list of all configured transports.
-    /// - [Self::delete_transport()] to remove a transport.
-    async fn add_transport(&self, account_id: u32, param: EnteredLoginParam) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.add_transport(&param.try_into()?).await
-    }
-
-    /// Adds a new email account as a transport
-    /// using the server encoded in the QR code.
-    /// See [Self::add_transport].
-    async fn add_transport_from_qr(&self, account_id: u32, qr: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.add_transport_from_qr(&qr).await
-    }
-
-    /// Returns the list of all email accounts that are used as a transport in the current profile.
-    /// Use [Self::add_transport()] to add or change a transport
-    /// and [Self::delete_transport()] to delete a transport.
-    async fn list_transports(&self, account_id: u32) -> Result<Vec<EnteredLoginParam>> {
-        let ctx = self.get_context(account_id).await?;
-        let res = ctx
-            .list_transports()
-            .await?
-            .into_iter()
-            .map(|t| t.into())
-            .collect();
-        Ok(res)
-    }
-
-    /// Removes the transport with the specified email address
-    /// (i.e. [EnteredLoginParam::addr]).
-    async fn delete_transport(&self, account_id: u32, addr: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.delete_transport(&addr).await
-    }
-
     /// Signal an ongoing process to stop.
     async fn stop_ongoing_process(&self, account_id: u32) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
@@ -1281,15 +1205,7 @@ impl CommandApi {
     async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs_ex(&ctx, &msgs, false).await
-    }
-
-    /// Delete messages. The messages are deleted on the current device,
-    /// on the IMAP server and also for all chat members
-    async fn delete_messages_for_all(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs_ex(&ctx, &msgs, true).await
+        delete_msgs(&ctx, &msgs).await
     }
 
     /// Get an informational text for a single message. The text is multiline and may
@@ -1602,18 +1518,6 @@ impl CommandApi {
             .collect())
     }
 
-    /// Imports contacts from a vCard.
-    ///
-    /// Returns the ids of created/modified contacts in the order they appear in the vCard.
-    async fn import_vcard_contents(&self, account_id: u32, vcard: String) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(deltachat::contact::import_vcard(&ctx, &vcard)
-            .await?
-            .into_iter()
-            .map(|c| c.to_u32())
-            .collect())
-    }
-
     /// Returns a vCard containing contacts with the given ids.
     async fn make_vcard(&self, account_id: u32, contacts: Vec<u32>) -> Result<String> {
         let ctx = self.get_context(account_id).await?;

deltachat-jsonrpc/src/api/types/events.rs

@@ -243,12 +243,6 @@ pub enum EventType {
         timer: u32,
     },
 
-    /// Chat deleted.
-    ChatDeleted {
-        /// Chat ID.
-        chat_id: u32,
-    },
-
     /// Contact(s) created, renamed, blocked or deleted.
     #[serde(rename_all = "camelCase")]
     ContactsChanged {
@@ -505,9 +499,6 @@ impl From<CoreEventType> for EventType {
                     timer: timer.to_u32(),
                 }
             }
-            CoreEventType::ChatDeleted { chat_id } => ChatDeleted {
-                chat_id: chat_id.to_u32(),
-            },
             CoreEventType::ContactsChanged(contact) => ContactsChanged {
                 contact_id: contact.map(|c| c.to_u32()),
             },

deltachat-jsonrpc/src/api/types/login_param.rs

@@ -1,179 +0,0 @@
-use anyhow::Result;
-use deltachat::login_param as dc;
-use serde::Deserialize;
-use serde::Serialize;
-use yerpc::TypeDef;
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct EnteredServerLoginParam {
-    /// Server hostname or IP address.
-    pub server: String,
-
-    /// Server port.
-    ///
-    /// 0 if not specified.
-    pub port: u16,
-
-    /// Socket security.
-    pub security: Socket,
-
-    /// Username.
-    ///
-    /// Empty string if not specified.
-    pub user: String,
-
-    /// Password.
-    pub password: String,
-}
-
-impl From<dc::EnteredServerLoginParam> for EnteredServerLoginParam {
-    fn from(param: dc::EnteredServerLoginParam) -> Self {
-        Self {
-            server: param.server,
-            port: param.port,
-            security: param.security.into(),
-            user: param.user,
-            password: param.password,
-        }
-    }
-}
-
-impl From<EnteredServerLoginParam> for dc::EnteredServerLoginParam {
-    fn from(param: EnteredServerLoginParam) -> Self {
-        Self {
-            server: param.server,
-            port: param.port,
-            security: param.security.into(),
-            user: param.user,
-            password: param.password,
-        }
-    }
-}
-
-/// Login parameters entered by the user.
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct EnteredLoginParam {
-    /// Email address.
-    pub addr: String,
-
-    /// IMAP settings.
-    pub imap: EnteredServerLoginParam,
-
-    /// SMTP settings.
-    pub smtp: EnteredServerLoginParam,
-
-    /// TLS options: whether to allow invalid certificates and/or
-    /// invalid hostnames
-    pub certificate_checks: EnteredCertificateChecks,
-
-    /// If true, login via OAUTH2 (not recommended anymore)
-    pub oauth2: bool,
-}
-
-impl From<dc::EnteredLoginParam> for EnteredLoginParam {
-    fn from(param: dc::EnteredLoginParam) -> Self {
-        Self {
-            addr: param.addr,
-            imap: param.imap.into(),
-            smtp: param.smtp.into(),
-            certificate_checks: param.certificate_checks.into(),
-            oauth2: param.oauth2,
-        }
-    }
-}
-
-impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
-    type Error = anyhow::Error;
-
-    fn try_from(param: EnteredLoginParam) -> Result<Self> {
-        Ok(Self {
-            addr: param.addr,
-            imap: param.imap.into(),
-            smtp: param.smtp.into(),
-            certificate_checks: param.certificate_checks.into(),
-            oauth2: param.oauth2,
-        })
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub enum Socket {
-    /// Unspecified socket security, select automatically.
-    Automatic,
-
-    /// TLS connection.
-    Ssl,
-
-    /// STARTTLS connection.
-    Starttls,
-
-    /// No TLS, plaintext connection.
-    Plain,
-}
-
-impl From<dc::Socket> for Socket {
-    fn from(value: dc::Socket) -> Self {
-        match value {
-            dc::Socket::Automatic => Self::Automatic,
-            dc::Socket::Ssl => Self::Ssl,
-            dc::Socket::Starttls => Self::Starttls,
-            dc::Socket::Plain => Self::Plain,
-        }
-    }
-}
-
-impl From<Socket> for dc::Socket {
-    fn from(value: Socket) -> Self {
-        match value {
-            Socket::Automatic => Self::Automatic,
-            Socket::Ssl => Self::Ssl,
-            Socket::Starttls => Self::Starttls,
-            Socket::Plain => Self::Plain,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub enum EnteredCertificateChecks {
-    /// `Automatic` means that provider database setting should be taken.
-    /// If there is no provider database setting for certificate checks,
-    /// check certificates strictly.
-    Automatic,
-
-    /// Ensure that TLS certificate is valid for the server hostname.
-    Strict,
-
-    /// Accept certificates that are expired, self-signed
-    /// or otherwise not valid for the server hostname.
-    AcceptInvalidCertificates,
-}
-
-impl From<dc::EnteredCertificateChecks> for EnteredCertificateChecks {
-    fn from(value: dc::EnteredCertificateChecks) -> Self {
-        match value {
-            dc::EnteredCertificateChecks::Automatic => Self::Automatic,
-            dc::EnteredCertificateChecks::Strict => Self::Strict,
-            dc::EnteredCertificateChecks::AcceptInvalidCertificates => {
-                Self::AcceptInvalidCertificates
-            }
-            dc::EnteredCertificateChecks::AcceptInvalidCertificates2 => {
-                Self::AcceptInvalidCertificates
-            }
-        }
-    }
-}
-
-impl From<EnteredCertificateChecks> for dc::EnteredCertificateChecks {
-    fn from(value: EnteredCertificateChecks) -> Self {
-        match value {
-            EnteredCertificateChecks::Automatic => Self::Automatic,
-            EnteredCertificateChecks::Strict => Self::Strict,
-            EnteredCertificateChecks::AcceptInvalidCertificates => Self::AcceptInvalidCertificates,
-        }
-    }
-}

deltachat-jsonrpc/src/api/types/mod.rs

@@ -5,7 +5,6 @@ pub mod contact;
 pub mod events;
 pub mod http;
 pub mod location;
-pub mod login_param;
 pub mod message;
 pub mod provider_info;
 pub mod qr;

deltachat-jsonrpc/src/webserver.rs

@@ -0,0 +1,47 @@
+#![recursion_limit = "256"]
+use std::net::SocketAddr;
+use std::path::PathBuf;
+
+use axum::{extract::ws::WebSocketUpgrade, response::Response, routing::get, Extension, Router};
+use yerpc::axum::handle_ws_rpc;
+use yerpc::{RpcClient, RpcSession};
+
+mod api;
+use api::{Accounts, CommandApi};
+
+const DEFAULT_PORT: u16 = 20808;
+
+#[tokio::main(flavor = "multi_thread")]
+async fn main() -> Result<(), std::io::Error> {
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+
+    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "./accounts".to_string());
+    let port = std::env::var("DC_PORT")
+        .map(|port| port.parse::<u16>().expect("DC_PORT must be a number"))
+        .unwrap_or(DEFAULT_PORT);
+    log::info!("Starting with accounts directory `{path}`.");
+    let writable = true;
+    let accounts = Accounts::new(PathBuf::from(&path), writable).await.unwrap();
+    let state = CommandApi::new(accounts);
+
+    let app = Router::new()
+        .route("/ws", get(handler))
+        .layer(Extension(state.clone()));
+
+    tokio::spawn(async move {
+        state.accounts.write().await.start_io().await;
+    });
+
+    let addr = SocketAddr::from(([127, 0, 0, 1], port));
+    log::info!("JSON-RPC WebSocket server listening on {}", addr);
+    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+    axum::serve(listener, app).await.unwrap();
+
+    Ok(())
+}
+
+async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) -> Response {
+    let (client, out_receiver) = RpcClient::new();
+    let session = RpcSession::new(client.clone(), api.clone());
+    handle_ws_rpc(ws, out_receiver, session).await
+}

deltachat-jsonrpc/typescript/example.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>DeltaChat JSON-RPC example</title>
+    <style>
+      body {
+        font-family: monospace;
+        background: black;
+        color: grey;
+      }
+      .grid {
+        display: grid;
+        grid-template-columns: 3fr 1fr;
+        grid-template-areas: "a a" "b c";
+      }
+      .message {
+        color: red;
+      }
+      #header {
+        grid-area: a;
+        color: white;
+        font-size: 1.2rem;
+      }
+      #header a {
+        color: white;
+        font-weight: bold;
+      }
+      #main {
+        grid-area: b;
+        color: green;
+      }
+      #main h2,
+      #main h3 {
+        color: blue;
+      }
+      #side {
+        grid-area: c;
+        color: #777;
+        overflow-y: auto;
+      }
+    </style>
+    <script type="module" src="dist/example.bundle.js"></script>
+  </head>
+  <body>
+    <h1>DeltaChat JSON-RPC example</h1>
+    <div class="grid">
+      <div id="header"></div>
+      <div id="main"></div>
+      <div id="side"><h2>log</h2></div>
+    </div>
+    <p>
+      Tip: open the dev console and use the client with
+      <code>window.client</code>
+    </p>
+  </body>
+</html>

deltachat-jsonrpc/typescript/example/example.ts

@@ -0,0 +1,109 @@
+import { DcEvent, DeltaChat } from "../deltachat.js";
+
+var SELECTED_ACCOUNT = 0;
+
+window.addEventListener("DOMContentLoaded", (_event) => {
+  (window as any).selectDeltaAccount = (id: string) => {
+    SELECTED_ACCOUNT = Number(id);
+    window.dispatchEvent(new Event("account-changed"));
+  };
+  console.log("launch run script...");
+  run().catch((err) => console.error("run failed", err));
+});
+
+async function run() {
+  const $main = document.getElementById("main")!;
+  const $side = document.getElementById("side")!;
+  const $head = document.getElementById("header")!;
+
+  const client = new DeltaChat("ws://localhost:20808/ws");
+
+  (window as any).client = client.rpc;
+
+  client.on("ALL", (accountId, event) => {
+    onIncomingEvent(accountId, event);
+  });
+
+  window.addEventListener("account-changed", async (_event: Event) => {
+    listChatsForSelectedAccount();
+  });
+
+  await Promise.all([loadAccountsInHeader(), listChatsForSelectedAccount()]);
+
+  async function loadAccountsInHeader() {
+    console.log("load accounts");
+    const accounts = await client.rpc.getAllAccounts();
+    console.log("accounts loaded", accounts);
+    for (const account of accounts) {
+      if (account.kind === "Configured") {
+        write(
+          $head,
+          `<a href="#" onclick="selectDeltaAccount(${account.id})">
+          ${account.id}: ${account.addr!}
+          </a>&nbsp;`
+        );
+      } else {
+        write(
+          $head,
+          `<a href="#">
+          ${account.id}: (unconfigured)
+          </a>&nbsp;`
+        );
+      }
+    }
+  }
+
+  async function listChatsForSelectedAccount() {
+    clear($main);
+    const selectedAccount = SELECTED_ACCOUNT;
+    const info = await client.rpc.getAccountInfo(selectedAccount);
+    if (info.kind !== "Configured") {
+      return write($main, "Account is not configured");
+    }
+    write($main, `<h2>${info.addr!}</h2>`);
+    const chats = await client.rpc.getChatlistEntries(
+      selectedAccount,
+      0,
+      null,
+      null
+    );
+    for (const chatId of chats) {
+      const chat = await client.rpc.getFullChatById(selectedAccount, chatId);
+      write($main, `<h3>${chat.name}</h3>`);
+      const messageIds = await client.rpc.getMessageIds(
+        selectedAccount,
+        chatId,
+        false,
+        false
+      );
+      const messages = await client.rpc.getMessages(
+        selectedAccount,
+        messageIds
+      );
+      for (const [_messageId, message] of Object.entries(messages)) {
+        if (message.kind === "message") write($main, `<p>${message.text}</p>`);
+        else write($main, `<p>loading error: ${message.error}</p>`);
+      }
+    }
+  }
+
+  function onIncomingEvent(accountId: number, event: DcEvent) {
+    write(
+      $side,
+      `
+        <p class="message">
+          [<strong>${event.kind}</strong> on account ${accountId}]<br>
+          <em>f1:</em> ${JSON.stringify(
+            Object.assign({}, event, { kind: undefined })
+          )}
+        </p>`
+    );
+  }
+}
+
+function write(el: HTMLElement, html: string) {
+  el.innerHTML += html;
+}
+function clear(el: HTMLElement) {
+  el.innerHTML = "";
+}

deltachat-jsonrpc/typescript/example/node-add-account.js

@@ -0,0 +1,29 @@
+import { DeltaChat } from "../dist/deltachat.js";
+
+run().catch(console.error);
+
+async function run() {
+  const delta = new DeltaChat("ws://localhost:20808/ws");
+  delta.on("event", (event) => {
+    console.log("event", event.data);
+  });
+
+  const email = process.argv[2];
+  const password = process.argv[3];
+  if (!email || !password)
+    throw new Error(
+      "USAGE: node node-add-account.js <EMAILADDRESS> <PASSWORD>"
+    );
+  console.log(`creating account for ${email}`);
+  const id = await delta.rpc.addAccount();
+  console.log(`created account id ${id}`);
+  await delta.rpc.setConfig(id, "addr", email);
+  await delta.rpc.setConfig(id, "mail_pw", password);
+  console.log("configuration updated");
+  await delta.rpc.configure(id);
+  console.log("account configured!");
+
+  const accounts = await delta.rpc.getAllAccounts();
+  console.log("accounts", accounts);
+  console.log("waiting for events...");
+}

deltachat-jsonrpc/typescript/example/node-demo.js

@@ -0,0 +1,14 @@
+import { DeltaChat } from "../dist/deltachat.js";
+
+run().catch(console.error);
+
+async function run() {
+  const delta = new DeltaChat();
+  delta.on("event", (event) => {
+    console.log("event", event.data);
+  });
+
+  const accounts = await delta.rpc.getAllAccounts();
+  console.log("accounts", accounts);
+  console.log("waiting for events...");
+}

deltachat-jsonrpc/typescript/package.json

@@ -34,7 +34,7 @@
   "name": "@deltachat/jsonrpc-client",
   "repository": {
     "type": "git",
-    "url": "https://github.com/chatmail/core.git"
+    "url": "https://github.com/deltachat/deltachat-core-rust.git"
   },
   "scripts": {
     "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
@@ -42,6 +42,10 @@
     "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
     "build:tsc": "tsc",
     "docs": "typedoc --out docs deltachat.ts",
+    "example": "run-s build example:build example:start",
+    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
+    "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
+    "example:start": "http-server .",
     "extract-constants": "node ./scripts/generate-constants.js",
     "generate-bindings": "cargo test",
     "prettier:check": "prettier --check .",
@@ -54,5 +58,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.157.3"
+  "version": "1.156.1"
 }

deltachat-jsonrpc/typescript/src/client.ts

@@ -2,7 +2,7 @@ import * as T from "../generated/types.js";
 import { EventType } from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { BaseTransport, Request } from "yerpc";
+import { WebsocketTransport, BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "@deltachat/tiny-emitter";
 
 type Events = { ALL: (accountId: number, event: EventType) => void } & {
@@ -74,6 +74,34 @@ export class BaseDeltaChat<
   }
 }
 
+export type Opts = {
+  url: string;
+  startEventLoop: boolean;
+};
+
+export const DEFAULT_OPTS: Opts = {
+  url: "ws://localhost:20808/ws",
+  startEventLoop: true,
+};
+export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
+  opts: Opts;
+  close() {
+    this.transport.close();
+  }
+  constructor(opts?: Opts | string) {
+    if (typeof opts === "string") {
+      opts = { ...DEFAULT_OPTS, url: opts };
+    } else if (opts) {
+      opts = { ...DEFAULT_OPTS, ...opts };
+    } else {
+      opts = { ...DEFAULT_OPTS };
+    }
+    const transport = new WebsocketTransport(opts.url);
+    super(transport, opts.startEventLoop);
+    this.opts = opts;
+  }
+}
+
 export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
   close() {}
   constructor(input: any, output: any, startEventLoop: boolean) {

deltachat-jsonrpc/typescript/tsconfig.json

@@ -15,6 +15,6 @@
     "noImplicitAny": true,
     "isolatedModules": true
   },
-  "include": ["*.ts", "test/*.ts"],
+  "include": ["*.ts", "example/*.ts", "test/*.ts"],
   "compileOnSave": false
 }

deltachat-repl/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "deltachat-repl"
-version = "1.157.3"
+version = "1.156.1"
 license = "MPL-2.0"
 edition = "2021"
-repository = "https://github.com/chatmail/core"
+repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [dependencies]
 anyhow = { workspace = true }

deltachat-rpc-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.157.3"
+version = "1.156.1"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",

deltachat-rpc-client/src/deltachat_rpc_client/account.py

@@ -26,12 +26,9 @@ class Account:
     def _rpc(self) -> "Rpc":
         return self.manager.rpc
 
-    def wait_for_event(self, event_type=None) -> AttrDict:
+    def wait_for_event(self) -> AttrDict:
         """Wait until the next event and return it."""
-        while True:
-            next_event = AttrDict(self._rpc.wait_for_event(self.id))
-            if event_type is None or next_event.kind == event_type:
-                return next_event
+        return AttrDict(self._rpc.wait_for_event(self.id))
 
     def clear_all_events(self):
         """Removes all queued-up events for a given account. Useful for tests."""
@@ -41,16 +38,6 @@ class Account:
         """Remove the account."""
         self._rpc.remove_account(self.id)
 
-    def clone(self) -> "Account":
-        """Clone given account.
-        This uses backup-transfer via iroh, i.e. the 'Add second device' feature."""
-        future = self._rpc.provide_backup.future(self.id)
-        qr = self._rpc.get_backup_qr(self.id)
-        new_account = self.manager.add_account()
-        new_account._rpc.get_backup(new_account.id, qr)
-        future()
-        return new_account
-
     def start_io(self) -> None:
         """Start the account I/O."""
         self._rpc.start_io(self.id)
@@ -96,10 +83,6 @@ class Account:
         return self.get_config("selfavatar")
 
     def check_qr(self, qr):
-        """Parse QR code contents.
-
-        This function takes the raw text scanned
-        and checks what can be done with it."""
         return self._rpc.check_qr(self.id, qr)
 
     def set_config_from_qr(self, qr: str):
@@ -113,7 +96,10 @@ class Account:
     def bring_online(self):
         """Start I/O and wait until IMAP becomes IDLE."""
         self.start_io()
-        self.wait_for_event(EventType.IMAP_INBOX_IDLE)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.IMAP_INBOX_IDLE:
+                break
 
     def create_contact(self, obj: Union[int, str, Contact], name: Optional[str] = None) -> Contact:
         """Create a new Contact or return an existing one.
@@ -132,28 +118,11 @@ class Account:
             obj = obj.get_snapshot().address
         return Contact(self, self._rpc.create_contact(self.id, obj, name))
 
-    def make_vcard(self, contacts: list[Contact]) -> str:
-        """Create vCard with the given contacts."""
-        assert all(contact.account == self for contact in contacts)
-        contact_ids = [contact.id for contact in contacts]
-        return self._rpc.make_vcard(self.id, contact_ids)
-
-    def import_vcard(self, vcard: str) -> list[Contact]:
-        """Import vCard.
-
-        Return created or modified contacts in the order they appear in vCard."""
-        contact_ids = self._rpc.import_vcard_contents(self.id, vcard)
-        return [Contact(self, contact_id) for contact_id in contact_ids]
-
     def create_chat(self, account: "Account") -> Chat:
-        vcard = account.self_contact.make_vcard()
-        [contact] = self.import_vcard(vcard)
+        addr = account.get_config("addr")
+        contact = self.create_contact(addr)
         return contact.create_chat()
 
-    def get_device_chat(self) -> Chat:
-        """Return device chat."""
-        return self.device_contact.create_chat()
-
     def get_contact_by_id(self, contact_id: int) -> Contact:
         """Return Contact instance for the given contact ID."""
         return Contact(self, contact_id)
@@ -214,11 +183,6 @@ class Account:
         """This account's identity as a Contact."""
         return Contact(self, SpecialContactId.SELF)
 
-    @property
-    def device_contact(self) -> Chat:
-        """This account's device contact."""
-        return Contact(self, SpecialContactId.DEVICE)
-
     def get_chatlist(
         self,
         query: Optional[str] = None,
@@ -332,15 +296,17 @@ class Account:
 
     def wait_for_incoming_msg_event(self):
         """Wait for incoming message event and return it."""
-        return self.wait_for_event(EventType.INCOMING_MSG)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.INCOMING_MSG:
+                return event
 
     def wait_for_msgs_changed_event(self):
         """Wait for messages changed event and return it."""
-        return self.wait_for_event(EventType.MSGS_CHANGED)
-
-    def wait_for_msgs_noticed_event(self):
-        """Wait for messages noticed event and return it."""
-        return self.wait_for_event(EventType.MSGS_NOTICED)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.MSGS_CHANGED:
+                return event
 
     def wait_for_incoming_msg(self):
         """Wait for incoming message and return it.
@@ -361,7 +327,10 @@ class Account:
                 break
 
     def wait_for_reactions_changed(self):
-        return self.wait_for_event(EventType.REACTIONS_CHANGED)
+        while True:
+            event = self.wait_for_event()
+            if event.kind == EventType.REACTIONS_CHANGED:
+                return event
 
     def get_fresh_messages_in_arrival_order(self) -> list[Message]:
         """Return fresh messages list sorted in the order of their arrival, with ascending IDs."""

deltachat-rpc-client/src/deltachat_rpc_client/contact.py

@@ -66,4 +66,4 @@ class Contact:
         )
 
     def make_vcard(self) -> str:
-        return self.account.make_vcard([self])
+        return self._rpc.make_vcard(self.account.id, [self.id])

deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py

@@ -4,7 +4,6 @@ import os
 import random
 from typing import AsyncGenerator, Optional
 
-import py
 import pytest
 
 from . import Account, AttrDict, Bot, Chat, Client, DeltaChat, EventType, Message
@@ -125,50 +124,3 @@ def rpc(tmp_path) -> AsyncGenerator:
 @pytest.fixture
 def acfactory(rpc) -> AsyncGenerator:
     return ACFactory(DeltaChat(rpc))
-
-
-@pytest.fixture
-def data():
-    """Test data."""
-
-    class Data:
-        def __init__(self) -> None:
-            for path in reversed(py.path.local(__file__).parts()):
-                datadir = path.join("test-data")
-                if datadir.isdir():
-                    self.path = datadir
-                    return
-            raise Exception("Data path cannot be found")
-
-        def get_path(self, bn):
-            """return path of file or None if it doesn't exist."""
-            fn = os.path.join(self.path, *bn.split("/"))
-            assert os.path.exists(fn)
-            return fn
-
-        def read_path(self, bn, mode="r"):
-            fn = self.get_path(bn)
-            if fn is not None:
-                with open(fn, mode) as f:
-                    return f.read()
-            return None
-
-    return Data()
-
-
-@pytest.fixture
-def log():
-    """Log printer fixture."""
-
-    class Printer:
-        def section(self, msg: str) -> None:
-            print()
-            print("=" * 10, msg, "=" * 10)
-
-        def step(self, msg: str) -> None:
-            print("-" * 5, "step " + msg, "-" * 5)
-
-        def indent(self, msg: str) -> None:
-            print("  " + msg)
-
-    return Printer()

deltachat-rpc-client/tests/test_chatlist_events.py

@@ -157,7 +157,11 @@ def get_multi_account_test_setup(acfactory: ACFactory) -> [Account, Account, Acc
 
     bob.wait_for_incoming_msg_event()
 
-    alice_second_device = alice.clone()
+    alice_second_device: Account = acfactory.get_unconfigured_account()
+
+    alice._rpc.provide_backup.future(alice.id)
+    backup_code = alice._rpc.get_backup_qr(alice.id)
+    alice_second_device._rpc.get_backup(alice_second_device.id, backup_code)
     alice_second_device.start_io()
     alice.clear_all_events()
     alice_second_device.clear_all_events()

deltachat-rpc-client/tests/test_iroh_webxdc.py

@@ -175,11 +175,17 @@ def test_no_duplicate_messages(acfactory, path_to_webxdc):
 
     threading.Thread(target=thread_run, daemon=True).start()
 
-    event = ac2.wait_for_event(EventType.WEBXDC_REALTIME_DATA)
-    n = int(bytes(event.data).decode())
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            n = int(bytes(event.data).decode())
+            break
 
-    event = ac2.wait_for_event(EventType.WEBXDC_REALTIME_DATA)
-    assert int(bytes(event.data).decode()) > n
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            assert int(bytes(event.data).decode()) > n
+            break
 
 
 def test_no_reordering(acfactory, path_to_webxdc):
@@ -223,5 +229,8 @@ def test_advertisement_after_chatting(acfactory, path_to_webxdc):
     ac2_hello_msg_snapshot.chat.accept()
 
     ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-    event = ac1.wait_for_event(EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED)
-    assert event.msg_id == ac1_webxdc_msg.id
+    while 1:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED:
+            assert event.msg_id == ac1_webxdc_msg.id
+            break

deltachat-rpc-client/tests/test_key_transfer.py

@@ -21,7 +21,6 @@ def test_autocrypt_setup_message_key_transfer(acfactory):
     alice2.set_config("addr", alice1.get_config("addr"))
     alice2.set_config("mail_pw", alice1.get_config("mail_pw"))
     alice2.configure()
-    alice2.bring_online()
 
     setup_code = alice1.initiate_autocrypt_key_transfer()
     msg = wait_for_autocrypt_setup_message(alice2)
@@ -35,12 +34,10 @@ def test_autocrypt_setup_message_key_transfer(acfactory):
 
 def test_ac_setup_message_twice(acfactory):
     alice1 = acfactory.get_online_account()
-
     alice2 = acfactory.get_unconfigured_account()
     alice2.set_config("addr", alice1.get_config("addr"))
     alice2.set_config("mail_pw", alice1.get_config("mail_pw"))
     alice2.configure()
-    alice2.bring_online()
 
     # Send the first Autocrypt Setup Message and ignore it.
     _setup_code = alice1.initiate_autocrypt_key_transfer()

deltachat-rpc-client/tests/test_securejoin.py

@@ -60,12 +60,15 @@ def test_qr_setup_contact_svg(acfactory) -> None:
 
 
 @pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect):
+def test_qr_securejoin(acfactory, protect, tmp_path):
     alice, bob, fiona = acfactory.get_online_accounts(3)
 
     # Setup second device for Alice
     # to test observing securejoin protocol.
-    alice2 = alice.clone()
+    alice.export_backup(tmp_path)
+    files = list(tmp_path.glob("*.tar"))
+    alice2 = acfactory.get_unconfigured_account()
+    alice2.import_backup(files[0])
 
     logging.info("Alice creates a group")
     alice_chat = alice.create_group("Group", protect=protect)
@@ -76,11 +79,17 @@ def test_qr_securejoin(acfactory, protect):
     bob.secure_join(qr_code)
 
     # Alice deletes "vg-request".
-    alice.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
+    while True:
+        event = alice.wait_for_event()
+        if event["kind"] == "ImapMessageDeleted":
+            break
     alice.wait_for_securejoin_inviter_success()
     # Bob deletes "vg-auth-required", Alice deletes "vg-request-with-auth".
     for ac in [alice, bob]:
-        ac.wait_for_event(EventType.IMAP_MESSAGE_DELETED)
+        while True:
+            event = ac.wait_for_event()
+            if event["kind"] == "ImapMessageDeleted":
+                break
     bob.wait_for_securejoin_joiner_success()
 
     # Test that Alice verified Bob's profile.
@@ -457,7 +466,6 @@ def test_qr_new_group_unblocked(acfactory):
     assert ac2_msg.chat.get_basic_snapshot().is_contact_request
 
 
-@pytest.mark.skip(reason="AEAP is disabled for now")
 def test_aeap_flow_verified(acfactory):
     """Test that a new address is added to a contact when it changes its address."""
     ac1, ac2 = acfactory.get_online_accounts(2)

deltachat-rpc-client/tests/test_something.py

@@ -110,9 +110,12 @@ def test_account(acfactory) -> None:
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_text("Hello!")
 
-    event = bob.wait_for_incoming_msg_event()
-    chat_id = event.chat_id
-    msg_id = event.msg_id
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            chat_id = event.chat_id
+            msg_id = event.msg_id
+            break
 
     message = bob.get_message_by_id(msg_id)
     snapshot = message.get_snapshot()
@@ -284,34 +287,12 @@ def test_message(acfactory) -> None:
     assert reactions == snapshot.reactions
 
 
-def test_selfavatar_sync(acfactory, data, log) -> None:
-    alice = acfactory.get_online_account()
-
-    log.section("Alice adds a second device")
-    alice2 = alice.clone()
-
-    log.section("Second device goes online")
-    alice2.start_io()
-
-    log.section("First device changes avatar")
-    image = data.get_path("image/avatar1000x1000.jpg")
-    alice.set_config("selfavatar", image)
-    avatar_config = alice.get_config("selfavatar")
-    avatar_hash = os.path.basename(avatar_config)
-    print("Info: avatar hash is ", avatar_hash)
-
-    log.section("First device receives avatar change")
-    alice2.wait_for_event(EventType.SELFAVATAR_CHANGED)
-    avatar_config2 = alice2.get_config("selfavatar")
-    avatar_hash2 = os.path.basename(avatar_config2)
-    print("Info: avatar hash on second device is ", avatar_hash2)
-    assert avatar_hash == avatar_hash2
-    assert avatar_config != avatar_config2
-
-
-def test_reaction_seen_on_another_dev(acfactory) -> None:
+def test_reaction_seen_on_another_dev(acfactory, tmp_path) -> None:
     alice, bob = acfactory.get_online_accounts(2)
-    alice2 = alice.clone()
+    alice.export_backup(tmp_path)
+    files = list(tmp_path.glob("*.tar"))
+    alice2 = acfactory.get_unconfigured_account()
+    alice2.import_backup(files[0])
     alice2.start_io()
 
     bob_addr = bob.get_config("addr")
@@ -327,11 +308,18 @@ def test_reaction_seen_on_another_dev(acfactory) -> None:
     snapshot.chat.accept()
     message.send_reaction("😎")
     for a in [alice, alice2]:
-        a.wait_for_event(EventType.INCOMING_REACTION)
+        while True:
+            event = a.wait_for_event()
+            if event.kind == EventType.INCOMING_REACTION:
+                break
 
     alice2.clear_all_events()
     alice_chat_bob.mark_noticed()
-    chat_id = alice2.wait_for_event(EventType.MSGS_NOTICED).chat_id
+    while True:
+        event = alice2.wait_for_event()
+        if event.kind == EventType.MSGS_NOTICED:
+            chat_id = event.chat_id
+            break
     alice2_contact_bob = alice2.get_contact_by_addr(bob_addr)
     alice2_chat_bob = alice2_contact_bob.create_chat()
     assert chat_id == alice2_chat_bob.id
@@ -349,12 +337,16 @@ def test_is_bot(acfactory) -> None:
     alice.set_config("bot", "1")
     alice_chat_bob.send_text("Hello!")
 
-    event = bob.wait_for_incoming_msg_event()
-    message = bob.get_message_by_id(event.msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.chat_id == event.chat_id
-    assert snapshot.text == "Hello!"
-    assert snapshot.is_bot
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            msg_id = event.msg_id
+            message = bob.get_message_by_id(msg_id)
+            snapshot = message.get_snapshot()
+            assert snapshot.chat_id == event.chat_id
+            assert snapshot.text == "Hello!"
+            assert snapshot.is_bot
+            break
 
 
 def test_bot(acfactory) -> None:
@@ -515,7 +507,10 @@ def test_mdn_doesnt_break_autocrypt(acfactory) -> None:
 
     # Alice reads Bob's message.
     message.mark_seen()
-    bob.wait_for_event(EventType.MSG_READ)
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.MSG_READ:
+            break
 
     # Bob sends a message to Alice, it should also be encrypted.
     bob_chat_alice.send_text("Hi Alice!")
@@ -666,7 +661,7 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
             assert snapshot.chat == bob_chat_alice
 
 
-def test_markseen_contact_request(acfactory):
+def test_markseen_contact_request(acfactory, tmp_path):
     """
     Test that seen status is synchronized for contact request messages
     even though read receipt is not sent.
@@ -674,7 +669,10 @@ def test_markseen_contact_request(acfactory):
     alice, bob = acfactory.get_online_accounts(2)
 
     # Bob sets up a second device.
-    bob2 = bob.clone()
+    bob.export_backup(tmp_path)
+    files = list(tmp_path.glob("*.tar"))
+    bob2 = acfactory.get_unconfigured_account()
+    bob2.import_backup(files[0])
     bob2.start_io()
 
     alice_chat_bob = alice.create_chat(bob)
@@ -685,7 +683,10 @@ def test_markseen_contact_request(acfactory):
     assert message2.get_snapshot().state == MessageState.IN_FRESH
 
     message.mark_seen()
-    bob2.wait_for_event(EventType.MSGS_NOTICED)
+    while True:
+        event = bob2.wait_for_event()
+        if event.kind == EventType.MSGS_NOTICED:
+            break
     assert message2.get_snapshot().state == MessageState.IN_SEEN
 
 
@@ -715,30 +716,3 @@ def test_configured_imap_certificate_checks(acfactory):
     # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
     # This test is a regression test to prevent this happening again.
     assert configured_certificate_checks != "0"
-
-
-def test_no_old_msg_is_fresh(acfactory):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_clone = ac1.clone()
-    ac1_clone.start_io()
-
-    ac1.create_chat(ac2)
-    ac1_clone_chat = ac1_clone.create_chat(ac2)
-
-    ac1.get_device_chat().mark_noticed()
-
-    logging.info("Send a first message from ac2 to ac1 and check that it's 'fresh'")
-    first_msg = ac2.create_chat(ac1).send_text("Hi")
-    ac1.wait_for_incoming_msg_event()
-    assert ac1.create_chat(ac2).get_fresh_message_count() == 1
-    assert len(list(ac1.get_fresh_messages())) == 1
-
-    ac1.wait_for_event(EventType.IMAP_INBOX_IDLE)
-
-    logging.info("Send a message from ac1_clone to ac2 and check that ac1 marks the first message as 'noticed'")
-    ac1_clone_chat.send_text("Hi back")
-    ev = ac1.wait_for_msgs_noticed_event()
-
-    assert ev.chat_id == first_msg.get_snapshot().chat_id
-    assert ac1.create_chat(ac2).get_fresh_message_count() == 0
-    assert len(list(ac1.get_fresh_messages())) == 0

deltachat-rpc-client/tests/test_webxdc.py

@@ -1,3 +1,6 @@
+from deltachat_rpc_client import EventType
+
+
 def test_webxdc(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
@@ -6,9 +9,12 @@ def test_webxdc(acfactory) -> None:
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
 
-    event = bob.wait_for_incoming_msg_event()
-    bob_chat_alice = bob.get_chat_by_id(event.chat_id)
-    message = bob.get_message_by_id(event.msg_id)
+    while True:
+        event = bob.wait_for_event()
+        if event.kind == EventType.INCOMING_MSG:
+            bob_chat_alice = bob.get_chat_by_id(event.chat_id)
+            message = bob.get_message_by_id(event.msg_id)
+            break
 
     webxdc_info = message.get_webxdc_info()
     assert webxdc_info == {

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.157.3"
+version = "1.156.1"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"

deltachat-rpc-server/README.md

@@ -5,13 +5,13 @@ over standard I/O.
 
 ## Install
 
-To download binary pre-builds check the [releases page](https://github.com/chatmail/core/releases).
+To download binary pre-builds check the [releases page](https://github.com/deltachat/deltachat-core-rust/releases).
 Rename the downloaded binary to `deltachat-rpc-server` and add it to your `PATH`.
 
 To install from source run:
 
 ```sh
-cargo install --git https://github.com/chatmail/core/ deltachat-rpc-server
+cargo install --git https://github.com/deltachat/deltachat-core-rust/ deltachat-rpc-server
 ```
 
 The `deltachat-rpc-server` executable will be installed into `$HOME/.cargo/bin` that should be available

deltachat-rpc-server/npm-package/package.json

@@ -8,12 +8,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/chatmail/core.git"
+    "url": "https://github.com/deltachat/deltachat-core-rust.git"
   },
   "scripts": {
     "prepack": "node scripts/update_optional_dependencies_and_version.js"
   },
   "type": "module",
   "types": "index.d.ts",
-  "version": "1.157.3"
+  "version": "1.156.1"
 }

deltachat-rpc-server/npm-package/scripts/src/make_package.py

@@ -25,7 +25,7 @@ def write_package_json(platform_path, rust_target, my_binary_name):
         "license": "MPL-2.0",
         "repository": {
             "type": "git",
-            "url": "https://github.com/chatmail/core.git",
+            "url": "https://github.com/deltachat/deltachat-core-rust.git",
         },
     }
 

deltachat-rpc-server/npm-package/src/errors.js

@@ -2,7 +2,7 @@
 import { ENV_VAR_NAME } from "./const.js";
 
 const cargoInstallCommand =
-  "cargo install --git https://github.com/chatmail/core deltachat-rpc-server";
+  "cargo install --git https://github.com/deltachat/deltachat-core-rust deltachat-rpc-server";
 
 export function NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name) {
   return `deltachat-rpc-server not found:

deny.toml

@@ -10,11 +10,8 @@ ignore = [
     # Unmaintained instant
     "RUSTSEC-2024-0384",
 
-    # Unmaintained backoff
-    "RUSTSEC-2025-0012",
-
-    # Unmaintained paste
-    "RUSTSEC-2024-0436",
+    # DNSSEC validation that we don't use anyway.
+    "RUSTSEC-2025-0006",
 ]
 
 [bans]
@@ -30,29 +27,24 @@ skip = [
      { name = "core-foundation", version = "0.9.4" },
      { name = "event-listener", version = "2.5.3" },
      { name = "generator", version = "0.7.5" },
-     { name = "getrandom", version = "0.2.12" },
-     { name = "heck", version = "0.4.1" },
      { name = "http", version = "0.2.12" },
      { name = "loom", version = "0.5.6" },
      { name = "netlink-packet-route", version = "0.17.1" },
      { name = "nix", version = "0.26.4" },
      { name = "nix", version = "0.27.1" },
      { name = "quick-error", version = "<2.0" },
-     { name = "rand_chacha", version = "0.3.1" },
-     { name = "rand_core", version = "0.6.4" },
-     { name = "rand", version = "0.8.5" },
      { name = "redox_syscall", version = "0.3.5" },
      { name = "regex-automata", version = "0.1.10" },
      { name = "regex-syntax", version = "0.6.29" },
      { name = "rtnetlink", version = "0.13.1" },
      { name = "security-framework", version = "2.11.1" },
-     { name = "strum_macros", version = "0.26.2" },
-     { name = "strum", version = "0.26.2" },
+     { name = "sync_wrapper", version = "0.1.2" },
      { name = "syn", version = "1.0.109" },
      { name = "thiserror-impl", version = "1.0.69" },
      { name = "thiserror", version = "1.0.69" },
+     { name = "tokio-tungstenite", version = "0.21.0" },
+     { name = "tungstenite", version = "0.21.0" },
      { name = "unicode-width", version = "0.1.11" },
-     { name = "wasi", version = "0.11.0+wasi-snapshot-preview1" },
      { name = "windows" },
      { name = "windows_aarch64_gnullvm" },
      { name = "windows_aarch64_msvc" },
@@ -69,7 +61,6 @@ skip = [
      { name = "windows_x86_64_gnu" },
      { name = "windows_x86_64_gnullvm" },
      { name = "windows_x86_64_msvc" },
-     { name = "zerocopy", version = "0.7.32" },
 ]
 
 
@@ -84,6 +75,7 @@ allow = [
     "ISC",
     "MIT",
     "MPL-2.0",
+    "OpenSSL",
     "Unicode-3.0",
     "Unicode-DFS-2016",
     "Zlib",
@@ -95,3 +87,9 @@ expression = "MIT AND ISC AND OpenSSL"
 license-files = [
       { path = "LICENSE", hash = 0xbd0eed23 },
 ]
+
+[sources.allow-org]
+# Organisations which we allow git sources from.
+github = [
+       "stalwartlabs",
+]

flake.nix

@@ -18,9 +18,9 @@
         manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
         androidSdk = android.sdk.${system} (sdkPkgs:
           builtins.attrValues {
-            inherit (sdkPkgs) ndk-27-2-12479018 cmdline-tools-latest;
+            inherit (sdkPkgs) ndk-27-0-11902837 cmdline-tools-latest;
           });
-        androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/27.2.12479018";
+        androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/27.0.11902837";
 
         rustSrc = nix-filter.lib {
           root = ./.;
@@ -30,7 +30,6 @@
           include = [
             ./benches
             ./assets
-            ./fuzz
             ./Cargo.lock
             ./Cargo.toml
             ./CMakeLists.txt
@@ -88,6 +87,9 @@
         };
         cargoLock = {
           lockFile = ./Cargo.lock;
+          outputHashes = {
+            "mail-builder-0.4.1" = "sha256-1hnsU76ProcX7iXT2UBjHnHbJ/ROT3077sLi3+yAV58=";
+          };
         };
         mkRustPackage = packageName:
           naersk'.buildPackage {
@@ -309,41 +311,10 @@
             LD = "${targetCc}";
           };
 
-        mkAndroidPackages = arch:
-          let
-            rpc-server = mkAndroidRustPackage arch "deltachat-rpc-server";
-          in
-          {
-            "deltachat-rpc-server-${arch}-android" = rpc-server;
-            "deltachat-repl-${arch}-android" = mkAndroidRustPackage arch "deltachat-repl";
-            "deltachat-rpc-server-${arch}-android-wheel" =
-              pkgs.stdenv.mkDerivation {
-                pname = "deltachat-rpc-server-${arch}-android-wheel";
-                version = manifest.version;
-                src = nix-filter.lib {
-                  root = ./.;
-                  include = [
-                    "scripts/wheel-rpc-server.py"
-                    "deltachat-rpc-server/README.md"
-                    "LICENSE"
-                    "Cargo.toml"
-                  ];
-                };
-                nativeBuildInputs = [
-                  pkgs.python3
-                  pkgs.python3Packages.wheel
-                ];
-                buildInputs = [
-                  rpc-server
-                ];
-                buildPhase = ''
-                  mkdir tmp
-                  cp ${rpc-server}/bin/deltachat-rpc-server tmp/deltachat-rpc-server
-                  python3 scripts/wheel-rpc-server.py ${arch}-android tmp/deltachat-rpc-server
-                '';
-                installPhase = ''mkdir -p $out; cp -av deltachat_rpc_server-*.whl $out'';
-              };
-          };
+        mkAndroidPackages = arch: {
+          "deltachat-rpc-server-${arch}-android" = mkAndroidRustPackage arch "deltachat-rpc-server";
+          "deltachat-repl-${arch}-android" = mkAndroidRustPackage arch "deltachat-repl";
+        };
 
         mkRustPackages = arch:
           let

fuzz/Cargo.toml

@@ -3,21 +3,28 @@ name = "deltachat-fuzz"
 version = "0.0.0"
 publish = false
 edition = "2021"
-license = "MPL-2.0"
 
 [dev-dependencies]
 bolero = "0.8"
 
 [dependencies]
-mailparse = { workspace = true }
+mailparse = "0.16"
 deltachat = { path = ".." }
 format-flowed = { path = "../format-flowed" }
 
+[workspace]
+members = ["."]
+
 [[test]]
 name = "fuzz_dateparse"
 path = "fuzz_targets/fuzz_dateparse.rs"
 harness = false
 
+[[test]]
+name = "fuzz_simplify"
+path = "fuzz_targets/fuzz_simplify.rs"
+harness = false
+
 [[test]]
 name = "fuzz_mailparse"
 path = "fuzz_targets/fuzz_mailparse.rs"

fuzz/fuzz_targets/fuzz_format_flowed.rs

@@ -9,7 +9,7 @@ fn round_trip(input: &str) -> String {
 
 fn main() {
     check!().for_each(|data: &[u8]| {
-        if let Ok(input) = std::str::from_utf8(data) {
+        if let Ok(input) = std::str::from_utf8(data.into()) {
             let input = input.trim().to_string();
 
             // Only consider inputs that are the result of unformatting format=flowed text.

fuzz/fuzz_targets/fuzz_simplify.rs

@@ -0,0 +1,13 @@
+use bolero::check;
+
+use deltachat::fuzzing::simplify;
+
+fn main() {
+    check!().for_each(|data: &[u8]| match String::from_utf8(data.to_vec()) {
+        Ok(input) => {
+            simplify(input.clone(), true);
+            simplify(input, false);
+        }
+        Err(_err) => {}
+    });
+}

python/README.rst

@@ -2,9 +2,9 @@
 CFFI Python Bindings
 ============================
 
-This package provides `Python bindings`_ to the `chatmail core library`_
+This package provides `Python bindings`_ to the `deltachat-core library`_
 which implements IMAP/SMTP/MIME/OpenPGP e-mail standards and offers
 a low-level Chat/Contact/Message API to user interfaces and bots.
 
-.. _`chatmail core library`: https://github.com/chatmail/core
+.. _`deltachat-core library`: https://github.com/deltachat/deltachat-core-rust
 .. _`Python bindings`: https://py.delta.chat/

python/doc/cffi/install.rst

@@ -43,7 +43,7 @@ Bootstrap Rust and Cargo by using rustup::
 
 Then clone the deltachat-core-rust repo::
 
-   git clone https://github.com/chatmail/core
+   git clone https://github.com/deltachat/deltachat-core-rust
    cd deltachat-core-rust
 
 To install the Delta Chat Python bindings make sure you have Python3 installed.

python/doc/index.rst

@@ -2,7 +2,7 @@ Delta Chat Python bindings, new and old
 =======
 
 `Delta Chat <https://delta.chat/>`_ provides two kinds of Python bindings
-to the `Rust Core <https://github.com/chatmail/core>`_:
+to the `Rust Core <https://github.com/deltachat/deltachat-core-rust>`_:
 JSON-RPC bindings and CFFI bindings.
 When starting a new project it is recommended to use JSON-RPC bindings,
 which are used in the Delta Chat Desktop app through generated Typescript-bindings. 
@@ -41,4 +41,4 @@ as the CFFI bindings are increasingly in maintenance-only mode.
 .. _virtualenv: http://pypi.org/project/virtualenv/
 .. _merlinux: http://merlinux.eu
 .. _pypi: http://pypi.org/
-.. _`issue-tracker`: https://github.com/chatmail/core
+.. _`issue-tracker`: https://github.com/deltachat/deltachat-core-rust

python/doc/jsonrpc/develop.rst

@@ -3,9 +3,9 @@ Development
 ===========
 
 To develop JSON-RPC bindings,
-clone the `chatmail core <https://github.com/chatmail/core/>`_ repository::
+clone the `deltachat-core-rust <https://github.com/deltachat/deltachat-core-rust/>`_ repository::
 
-   git clone https://github.com/chatmail/core.git
+   git clone https://github.com/deltachat/deltachat-core-rust.git
 
 Testing
 =======

python/doc/jsonrpc/install.rst

@@ -17,8 +17,8 @@ Install ``deltachat-rpc-server``
 To get ``deltachat-rpc-server`` binary you have three options:
 
 1. Install ``deltachat-rpc-server`` from PyPI using ``pip install deltachat-rpc-server``.
-2. Build and install ``deltachat-rpc-server`` from source with ``cargo install --git https://github.com/chatmail/core/ deltachat-rpc-server``.
-3. Download prebuilt release from https://github.com/chatmail/core/releases and install it into ``PATH``.
+2. Build and install ``deltachat-rpc-server`` from source with ``cargo install --git https://github.com/deltachat/deltachat-core-rust/ deltachat-rpc-server``.
+3. Download prebuilt release from https://github.com/deltachat/deltachat-core-rust/releases and install it into ``PATH``.
 
 Check that ``deltachat-rpc-server`` is installed and can run::
 
@@ -33,4 +33,4 @@ Install ``deltachat-rpc-client``
 To get ``deltachat-rpc-client`` Python library you can:
 
 1. Install ``deltachat-rpc-client`` from PyPI using ``pip install deltachat-rpc-client``.
-2. Install ``deltachat-rpc-client`` from source with ``pip install git+https://github.com/chatmail/core.git@main#subdirectory=deltachat-rpc-client``.
+2. Install ``deltachat-rpc-client`` from source with ``pip install git+https://github.com/deltachat/deltachat-core-rust.git@main#subdirectory=deltachat-rpc-client``.

python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat"
-version = "1.157.3"
+version = "1.156.1"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.8"
@@ -29,8 +29,8 @@ dependencies = [
 ]
 
 [project.urls]
-"Home" = "https://github.com/chatmail/core/"
-"Bug Tracker" = "https://github.com/chatmail/core/issues"
+"Home" = "https://github.com/deltachat/deltachat-core-rust/"
+"Bug Tracker" = "https://github.com/deltachat/deltachat-core-rust/issues"
 "Documentation" = "https://py.delta.chat/"
 "Mastodon" = "https://chaos.social/@delta"
 

python/src/deltachat/message.py

@@ -285,6 +285,23 @@ class Message:
         """Force the message to be sent in plain text."""
         lib.dc_msg_force_plaintext(self._dc_msg)
 
+    def get_mime_headers(self):
+        """return mime-header object for an incoming message.
+
+        This only returns a non-None object if ``save_mime_headers``
+        config option was set and the message is incoming.
+
+        :returns: email-mime message object (with headers only, no body).
+        """
+        import email
+
+        mime_headers = lib.dc_get_mime_headers(self.account._dc_context, self.id)
+        if mime_headers:
+            s = ffi.string(ffi.gc(mime_headers, lib.dc_str_unref))
+            if isinstance(s, bytes):
+                return email.message_from_bytes(s)
+            return email.message_from_string(s)
+
     @property
     def error(self) -> Optional[str]:
         """Error message."""

python/src/deltachat/testplugin.py

@@ -423,6 +423,8 @@ class ACFactory:
         where we can make valid SMTP and IMAP connections with.
         """
         configdict = next(self._liveconfig_producer).copy()
+        if "e2ee_enabled" not in configdict:
+            configdict["e2ee_enabled"] = "1"
 
         if self.pytestconfig.getoption("--strict-tls"):
             # Enable strict certificate checks for online accounts

python/tests/test_1_online.py

@@ -31,6 +31,37 @@ def test_basic_imap_api(acfactory, tmp_path):
     imap2.shutdown()
 
 
+@pytest.mark.ignored()
+def test_configure_generate_key(acfactory, lp):
+    # A slow test which will generate new keys.
+    acfactory.remove_preconfigured_keys()
+    ac1 = acfactory.new_online_configuring_account(key_gen_type=str(dc.const.DC_KEY_GEN_RSA2048))
+    ac2 = acfactory.new_online_configuring_account(key_gen_type=str(dc.const.DC_KEY_GEN_ED25519))
+    acfactory.bring_accounts_online()
+    chat = acfactory.get_accepted_chat(ac1, ac2)
+
+    lp.sec("ac1: send unencrypted message to ac2")
+    chat.send_text("message1")
+    lp.sec("ac2: waiting for message from ac1")
+    msg_in = ac2._evtracker.wait_next_incoming_message()
+    assert msg_in.text == "message1"
+    assert not msg_in.is_encrypted()
+
+    lp.sec("ac2: send encrypted message to ac1")
+    msg_in.chat.send_text("message2")
+    lp.sec("ac1: waiting for message from ac2")
+    msg2_in = ac1._evtracker.wait_next_incoming_message()
+    assert msg2_in.text == "message2"
+    assert msg2_in.is_encrypted()
+
+    lp.sec("ac1: send encrypted message to ac2")
+    msg2_in.chat.send_text("message3")
+    lp.sec("ac2: waiting for message from ac1")
+    msg3_in = ac2._evtracker.wait_next_incoming_message()
+    assert msg3_in.text == "message3"
+    assert msg3_in.is_encrypted()
+
+
 def test_configure_canceled(acfactory):
     ac1 = acfactory.new_online_configuring_account()
     ac1.stop_ongoing()
@@ -919,8 +950,67 @@ def test_gossip_optimization(acfactory, lp):
     assert gossiped_timestamp == int(msg.time_sent.timestamp())
 
 
+def test_gossip_encryption_preference(acfactory, lp):
+    """Test that encryption preference of group members is gossiped to new members.
+    This is a Delta Chat extension to Autocrypt 1.1.0, which Autocrypt-Gossip headers
+    SHOULD NOT contain encryption preference.
+    """
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
+
+    lp.sec("ac1 learns that ac2 prefers encryption")
+    ac1.create_chat(ac2)
+    msg = ac2.create_chat(ac1).send_text("first message")
+    msg = ac1._evtracker.wait_next_incoming_message()
+    assert msg.text == "first message"
+    assert not msg.is_encrypted()
+    res = "End-to-end encryption preferred:\n{}".format(ac2.get_config("addr"))
+    assert msg.chat.get_encryption_info() == res
+    lp.sec("ac2 learns that ac3 prefers encryption")
+    ac2.create_chat(ac3)
+    msg = ac3.create_chat(ac2).send_text("I prefer encryption")
+    msg = ac2._evtracker.wait_next_incoming_message()
+    assert msg.text == "I prefer encryption"
+    assert not msg.is_encrypted()
+
+    lp.sec("ac3 does not know that ac1 prefers encryption")
+    ac1.create_chat(ac3)
+    chat = ac3.create_chat(ac1)
+    res = "No encryption:\n{}".format(ac1.get_config("addr"))
+    assert chat.get_encryption_info() == res
+    msg = chat.send_text("not encrypted")
+    msg = ac1._evtracker.wait_next_incoming_message()
+    assert msg.text == "not encrypted"
+    assert not msg.is_encrypted()
+
+    lp.sec("ac1 creates a group chat with ac2")
+    group_chat = ac1.create_group_chat("hello")
+    group_chat.add_contact(ac2)
+    encryption_info = group_chat.get_encryption_info()
+    res = "End-to-end encryption preferred:\n{}".format(ac2.get_config("addr"))
+    assert encryption_info == res
+    msg = group_chat.send_text("hi")
+
+    msg = ac2._evtracker.wait_next_incoming_message()
+    assert msg.is_encrypted()
+    assert msg.text == "hi"
+
+    lp.sec("ac2 adds ac3 to the group")
+    msg.chat.add_contact(ac3)
+    assert msg.is_encrypted()
+
+    lp.sec("ac3 learns that ac1 prefers encryption")
+    msg = ac3._evtracker.wait_next_incoming_message()
+    encryption_info = msg.chat.get_encryption_info().splitlines()
+    assert encryption_info[0] == "End-to-end encryption preferred:"
+    assert ac1.get_config("addr") in encryption_info[1:]
+    assert ac2.get_config("addr") in encryption_info[1:]
+    msg = chat.send_text("encrypted")
+    assert msg.is_encrypted()
+
+
 def test_send_first_message_as_long_unicode_with_cr(acfactory, lp):
     ac1, ac2 = acfactory.get_online_accounts(2)
+    ac2.set_config("save_mime_headers", "1")
 
     lp.sec("ac1: create chat with ac2")
     chat = acfactory.get_accepted_chat(ac1, ac2)
@@ -1109,6 +1199,93 @@ def test_dont_show_emails(acfactory, lp):
     assert len(msg.chat.get_messages()) == 3
 
 
+def test_no_old_msg_is_fresh(acfactory, lp):
+    ac1 = acfactory.new_online_configuring_account()
+    ac2 = acfactory.new_online_configuring_account()
+    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
+    acfactory.bring_accounts_online()
+
+    ac1.set_config("e2ee_enabled", "0")
+    ac1_clone.set_config("e2ee_enabled", "0")
+    ac2.set_config("e2ee_enabled", "0")
+
+    ac1_clone.set_config("bcc_self", "1")
+
+    ac1.create_chat(ac2)
+    ac1_clone.create_chat(ac2)
+
+    ac1.get_device_chat().mark_noticed()
+
+    lp.sec("Send a first message from ac2 to ac1 and check that it's 'fresh'")
+    first_msg_id = ac2.create_chat(ac1).send_text("Hi")
+    ac1._evtracker.wait_next_incoming_message()
+    assert ac1.create_chat(ac2).count_fresh_messages() == 1
+    assert len(list(ac1.get_fresh_messages())) == 1
+
+    lp.sec("Send a message from ac1_clone to ac2 and check that ac1 marks the first message as 'noticed'")
+    ac1_clone.create_chat(ac2).send_text("Hi back")
+    ev = ac1._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
+
+    assert ev.data1 == first_msg_id.chat.id
+    assert ac1.create_chat(ac2).count_fresh_messages() == 0
+    assert len(list(ac1.get_fresh_messages())) == 0
+
+
+def test_prefer_encrypt(acfactory, lp):
+    """Test quorum rule for encryption preference in 1:1 and group chat."""
+    ac1 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
+    ac2 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
+    ac3 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
+    acfactory.bring_accounts_online()
+    ac1.set_config("e2ee_enabled", "0")
+    ac2.set_config("e2ee_enabled", "1")
+    ac3.set_config("e2ee_enabled", "0")
+
+    # Make sure we do not send a copy to ourselves. This is to
+    # test that we count own preference even when we are not in
+    # the recipient list.
+    ac1.set_config("bcc_self", "0")
+    ac2.set_config("bcc_self", "0")
+    ac3.set_config("bcc_self", "0")
+
+    acfactory.introduce_each_other([ac1, ac2, ac3])
+
+    lp.sec("ac1: sending message to ac2")
+    chat1 = ac1.create_chat(ac2)
+    msg1 = chat1.send_text("message1")
+    assert not msg1.is_encrypted()
+    ac2._evtracker.wait_next_incoming_message()
+
+    lp.sec("ac2: sending message to ac1")
+    chat2 = ac2.create_chat(ac1)
+    msg2 = chat2.send_text("message2")
+    # Own preference is `Mutual` and we have the peer's key.
+    assert msg2.is_encrypted()
+    ac1._evtracker.wait_next_incoming_message()
+
+    lp.sec("ac1: sending message to group chat with ac2 and ac3")
+    group = ac1.create_group_chat("hello")
+    group.add_contact(ac2)
+    group.add_contact(ac3)
+    msg3 = group.send_text("message3")
+    assert not msg3.is_encrypted()
+    ac2._evtracker.wait_next_incoming_message()
+    ac3._evtracker.wait_next_incoming_message()
+
+    lp.sec("ac3: start preferring encryption and inform ac1")
+    ac3.set_config("e2ee_enabled", "1")
+    chat3 = ac3.create_chat(ac1)
+    msg4 = chat3.send_text("message4")
+    # Own preference is `Mutual` and we have the peer's key.
+    assert msg4.is_encrypted()
+    ac1._evtracker.wait_next_incoming_message()
+
+    lp.sec("ac1: sending another message to group chat with ac2 and ac3")
+    msg5 = group.send_text("message5")
+    # Majority prefers encryption now
+    assert msg5.is_encrypted()
+
+
 def test_bot(acfactory, lp):
     """Test that bot messages can be identified as such"""
     ac1, ac2 = acfactory.get_online_accounts(2)
@@ -1137,6 +1314,59 @@ def test_bot(acfactory, lp):
     assert msg_in.is_bot()
 
 
+def test_quote_encrypted(acfactory, lp):
+    """Test that replies to encrypted messages with quotes are encrypted."""
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    lp.sec("ac1: create chat with ac2")
+    chat = ac1.create_chat(ac2)
+
+    lp.sec("sending text message from ac1 to ac2")
+    msg1 = chat.send_text("message1")
+    assert not msg1.is_encrypted()
+
+    lp.sec("wait for ac2 to receive message")
+    msg2 = ac2._evtracker.wait_next_incoming_message()
+    assert msg2.text == "message1"
+    assert not msg2.is_encrypted()
+
+    lp.sec("create new chat with contact and send back (encrypted) message")
+    msg2.create_chat().send_text("message-back")
+
+    lp.sec("wait for ac1 to receive message")
+    msg3 = ac1._evtracker.wait_next_incoming_message()
+    assert msg3.text == "message-back"
+    assert msg3.is_encrypted()
+
+    lp.sec("ac1: e2ee_enabled=0 and see if reply is encrypted")
+    print("ac1: e2ee_enabled={}".format(ac1.get_config("e2ee_enabled")))
+    print("ac2: e2ee_enabled={}".format(ac2.get_config("e2ee_enabled")))
+    ac1.set_config("e2ee_enabled", "0")
+
+    for quoted_msg in msg1, msg3:
+        # Save the draft with a quote.
+        msg_draft = Message.new_empty(ac1, "text")
+        msg_draft.set_text("message reply")
+        msg_draft.quote = quoted_msg
+        chat.set_draft(msg_draft)
+
+        # Get the draft and send it.
+        msg_draft = chat.get_draft()
+        chat.send_msg(msg_draft)
+
+        chat.set_draft(None)
+        assert chat.get_draft() is None
+
+        # Quote should be replaced with "..." if quoted message is encrypted.
+        msg_in = ac2._evtracker.wait_next_incoming_message()
+        assert msg_in.text == "message reply"
+        assert not msg_in.is_encrypted()
+        if quoted_msg.is_encrypted():
+            assert msg_in.quoted_text == "..."
+        else:
+            assert msg_in.quoted_text == quoted_msg.text
+
+
 def test_quote_attachment(tmp_path, acfactory, lp):
     """Test that replies with an attachment and a quote are received correctly."""
     ac1, ac2 = acfactory.get_online_accounts(2)
@@ -1170,6 +1400,26 @@ def test_quote_attachment(tmp_path, acfactory, lp):
     assert open(received_reply.filename).read() == "data to send"
 
 
+def test_saved_mime_on_received_message(acfactory, lp):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    lp.sec("configure ac2 to save mime headers, create ac1/ac2 chat")
+    ac2.set_config("save_mime_headers", "1")
+    chat = ac1.create_chat(ac2)
+
+    lp.sec("sending text message from ac1 to ac2")
+    msg_out = chat.send_text("message1")
+    ac1._evtracker.wait_msg_delivered(msg_out)
+    assert msg_out.get_mime_headers() is None
+
+    lp.sec("wait for ac2 to receive message")
+    ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
+    in_id = ev.data2
+    mime = ac2.get_message_by_id(in_id).get_mime_headers()
+    assert mime.get_all("From")
+    assert mime.get_all("Received")
+
+
 def test_send_mark_seen_clean_incoming_events(acfactory, lp):
     ac1, ac2 = acfactory.get_online_accounts(2)
     chat = acfactory.get_accepted_chat(ac1, ac2)

python/tests/test_3_offline.py

@@ -105,6 +105,10 @@ class TestOfflineAccountBasic:
         ac1.update_config({"mvbox_move": False})
         assert ac1.get_config("mvbox_move") == "0"
 
+    def test_has_savemime(self, acfactory):
+        ac1 = acfactory.get_unconfigured_account()
+        assert "save_mime_headers" in ac1.get_config("sys.config_keys").split()
+
     def test_has_bccself(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()
         assert "bcc_self" in ac1.get_config("sys.config_keys").split()

release-date.in

@@ -1 +1 @@
-2025-03-19
+2025-02-28

scripts/concourse/docs_wheels.yml

@@ -4,14 +4,14 @@ resources:
     icon: github
     source:
       branch: main
-      uri: https://github.com/chatmail/core.git
+      uri: https://github.com/deltachat/deltachat-core-rust.git
 
   - name: deltachat-core-rust-release
     type: git
     icon: github
     source:
       branch: main
-      uri: https://github.com/chatmail/core.git
+      uri: https://github.com/deltachat/deltachat-core-rust.git
       tag_filter: "v*"
 
 jobs:

scripts/wheel-rpc-server.py

@@ -154,8 +154,6 @@ arch2tags = {
     "armv6l-linux": "linux_armv6l",
     "aarch64-linux": "manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64",
     "i686-linux": "manylinux_2_12_i686.manylinux2010_i686.musllinux_1_1_i686",
-    "arm64-v8a-android": "android_21_arm64_v8a",
-    "armeabi-v7a-android": "android_21_armeabi_v7a",
     "win64": "win_amd64",
     "win32": "win32",
     # macOS versions for platform compatibility tags are taken from https://doc.rust-lang.org/rustc/platform-support.html

src/blob.rs

@@ -193,7 +193,6 @@ impl<'a> BlobObject<'a> {
     /// Note that this is NOT the user-visible filename,
     /// which is only stored in Param::Filename on the message.
     ///
-    #[allow(rustdoc::private_intra_doc_links)]
     /// [Params]: crate::param::Params
     pub fn as_name(&self) -> &str {
         &self.name
@@ -252,30 +251,26 @@ impl<'a> BlobObject<'a> {
         Ok(blob.as_name().to_string())
     }
 
-    /// Recode image to avatar size.
     pub async fn recode_to_avatar_size(&mut self, context: &Context) -> Result<()> {
-        let (img_wh, max_bytes) =
+        let img_wh =
             match MediaQuality::from_i32(context.get_config_int(Config::MediaQuality).await?)
                 .unwrap_or_default()
             {
-                MediaQuality::Balanced => (
-                    constants::BALANCED_AVATAR_SIZE,
-                    constants::BALANCED_AVATAR_BYTES,
-                ),
-                MediaQuality::Worse => {
-                    (constants::WORSE_AVATAR_SIZE, constants::WORSE_AVATAR_BYTES)
-                }
+                MediaQuality::Balanced => constants::BALANCED_AVATAR_SIZE,
+                MediaQuality::Worse => constants::WORSE_AVATAR_SIZE,
             };
 
         let maybe_sticker = &mut false;
-        let is_avatar = true;
+        let strict_limits = true;
+        // max_bytes is 20_000 bytes: Outlook servers don't allow headers larger than 32k.
+        // 32 / 4 * 3 = 24k if you account for base64 encoding. To be safe, we reduced this to 20k.
         self.recode_to_size(
             context,
             None, // The name of an avatar doesn't matter
             maybe_sticker,
             img_wh,
-            max_bytes,
-            is_avatar,
+            20_000,
+            strict_limits,
         )?;
 
         Ok(())
@@ -304,17 +299,21 @@ impl<'a> BlobObject<'a> {
                 ),
                 MediaQuality::Worse => (constants::WORSE_IMAGE_SIZE, constants::WORSE_IMAGE_BYTES),
             };
-        let is_avatar = false;
-        let new_name =
-            self.recode_to_size(context, name, maybe_sticker, img_wh, max_bytes, is_avatar)?;
+        let strict_limits = false;
+        let new_name = self.recode_to_size(
+            context,
+            name,
+            maybe_sticker,
+            img_wh,
+            max_bytes,
+            strict_limits,
+        )?;
 
         Ok(new_name)
     }
 
-    /// Recodes the image so that it fits into limits on width/height and byte size.
-    ///
-    /// If `!is_avatar`, then if `max_bytes` is exceeded, reduces the image to `img_wh` and proceeds
-    /// with the result without rechecking.
+    /// If `!strict_limits`, then if `max_bytes` is exceeded, reduce the image to `img_wh` and just
+    /// proceed with the result.
     ///
     /// This modifies the blob object in-place.
     ///
@@ -329,10 +328,10 @@ impl<'a> BlobObject<'a> {
         maybe_sticker: &mut bool,
         mut img_wh: u32,
         max_bytes: usize,
-        is_avatar: bool,
+        strict_limits: bool,
     ) -> Result<String> {
         // Add white background only to avatars to spare the CPU.
-        let mut add_white_bg = is_avatar;
+        let mut add_white_bg = img_wh <= constants::BALANCED_AVATAR_SIZE;
         let mut no_exif = false;
         let no_exif_ref = &mut no_exif;
         let mut name = name.unwrap_or_else(|| self.name.clone());
@@ -403,7 +402,7 @@ impl<'a> BlobObject<'a> {
             // also `Viewtype::Gif` (maybe renamed to `Animation`) should be used for animated
             // images.
             let do_scale = exceeds_max_bytes
-                || is_avatar
+                || strict_limits
                     && (exceeds_wh
                         || exif.is_some() && {
                             if mem::take(&mut add_white_bg) {
@@ -440,7 +439,7 @@ impl<'a> BlobObject<'a> {
                         ofmt.clone(),
                         max_bytes,
                         &mut encoded,
-                    )? && is_avatar
+                    )? && strict_limits
                     {
                         if img_wh < 20 {
                             return Err(format_err!(
@@ -490,7 +489,7 @@ impl<'a> BlobObject<'a> {
         match res {
             Ok(_) => res,
             Err(err) => {
-                if !is_avatar && no_exif {
+                if !strict_limits && no_exif {
                     warn!(
                         context,
                         "Cannot recode image, using original data: {err:#}.",

src/blob/blob_tests.rs

@@ -174,7 +174,7 @@ async fn test_selfavatar_outside_blobdir() {
     let avatar_blob = t.get_config(Config::Selfavatar).await.unwrap().unwrap();
     let avatar_path = Path::new(&avatar_blob);
     assert!(
-        avatar_blob.ends_with("009161310a6afc319163e4bcabd23b9.jpg"),
+        avatar_blob.ends_with("d98cd30ed8f2129bf3968420208849d.jpg"),
         "The avatar filename should be its hash, put instead it's {avatar_blob}"
     );
     let scaled_avatar_size = file_size(avatar_path).await;
@@ -226,7 +226,7 @@ async fn test_selfavatar_in_blobdir() {
         .unwrap();
     let avatar_cfg = t.get_config(Config::Selfavatar).await.unwrap().unwrap();
     assert!(
-        avatar_cfg.ends_with("ec054c444a5755adf2b0aaea40209f2.png"),
+        avatar_cfg.ends_with("fa7418e646301203538041f60d03190.png"),
         "Avatar file name {avatar_cfg} should end with its hash"
     );
 

src/chat.rs

@@ -434,7 +434,7 @@ impl ChatId {
                 .ok();
         }
         if delete {
-            self.delete_ex(context, Nosync).await?;
+            self.delete(context).await?;
         }
         Ok(())
     }
@@ -773,10 +773,6 @@ impl ChatId {
 
     /// Deletes a chat.
     pub async fn delete(self, context: &Context) -> Result<()> {
-        self.delete_ex(context, Sync).await
-    }
-
-    pub(crate) async fn delete_ex(self, context: &Context, sync: sync::Sync) -> Result<()> {
         ensure!(
             !self.is_special(),
             "bad chat_id, can not be a special chat: {}",
@@ -784,23 +780,10 @@ impl ChatId {
         );
 
         let chat = Chat::load_from_db(context, self).await?;
-        let delete_msgs_target = context.get_delete_msgs_target().await?;
-        let sync_id = match sync {
-            Nosync => None,
-            Sync => chat.get_sync_id(context).await?,
-        };
 
         context
             .sql
             .transaction(|transaction| {
-                transaction.execute(
-                    "UPDATE imap SET target=? WHERE rfc724_mid IN (SELECT rfc724_mid FROM msgs WHERE chat_id=?)",
-                    (delete_msgs_target, self,),
-                )?;
-                transaction.execute(
-                    "DELETE FROM smtp WHERE msg_id IN (SELECT id FROM msgs WHERE chat_id=?)",
-                    (self,),
-                )?;
                 transaction.execute(
                     "DELETE FROM msgs_mdns WHERE msg_id IN (SELECT id FROM msgs WHERE chat_id=?)",
                     (self,),
@@ -812,20 +795,7 @@ impl ChatId {
             })
             .await?;
 
-        context.emit_event(EventType::ChatDeleted { chat_id: self });
         context.emit_msgs_changed_without_ids();
-
-        if let Some(id) = sync_id {
-            self::sync(context, id, SyncAction::Delete)
-                .await
-                .log_err(context)
-                .ok();
-        }
-
-        if chat.is_self_talk() {
-            let mut msg = Message::new_text(stock_str::self_deleted_msg_body(context).await);
-            add_device_msg(context, None, Some(&mut msg)).await?;
-        }
         chatlist_events::emit_chatlist_changed(context);
 
         context
@@ -833,6 +803,12 @@ impl ChatId {
             .await?;
         context.scheduler.interrupt_inbox().await;
 
+        if chat.is_self_talk() {
+            let mut msg = Message::new_text(stock_str::self_deleted_msg_body(context).await);
+            add_device_msg(context, None, Some(&mut msg)).await?;
+        }
+        chatlist_events::emit_chatlist_changed(context);
+
         Ok(())
     }
 
@@ -1313,7 +1289,8 @@ impl ChatId {
     ///
     /// To get more verbose summary for a contact, including its key fingerprint, use [`Contact::get_encrinfo`].
     pub async fn get_encryption_info(self, context: &Context) -> Result<String> {
-        let mut ret_available = String::new();
+        let mut ret_mutual = String::new();
+        let mut ret_nopreference = String::new();
         let mut ret_reset = String::new();
 
         for contact_id in get_chat_contacts(context, self)
@@ -1329,9 +1306,8 @@ impl ChatId {
                 .filter(|peerstate| peerstate.peek_key(false).is_some())
                 .map(|peerstate| peerstate.prefer_encrypt)
             {
-                Some(EncryptPreference::Mutual) | Some(EncryptPreference::NoPreference) => {
-                    ret_available += &format!("{addr}\n")
-                }
+                Some(EncryptPreference::Mutual) => ret_mutual += &format!("{addr}\n"),
+                Some(EncryptPreference::NoPreference) => ret_nopreference += &format!("{addr}\n"),
                 Some(EncryptPreference::Reset) | None => ret_reset += &format!("{addr}\n"),
             };
         }
@@ -1343,14 +1319,23 @@ impl ChatId {
             ret.push('\n');
             ret += &ret_reset;
         }
-        if !ret_available.is_empty() {
+        if !ret_nopreference.is_empty() {
             if !ret.is_empty() {
                 ret.push('\n');
             }
             ret += &stock_str::e2e_available(context).await;
             ret.push(':');
             ret.push('\n');
-            ret += &ret_available;
+            ret += &ret_nopreference;
+        }
+        if !ret_mutual.is_empty() {
+            if !ret.is_empty() {
+                ret.push('\n');
+            }
+            ret += &stock_str::e2e_preferred(context).await;
+            ret.push(':');
+            ret.push('\n');
+            ret += &ret_mutual;
         }
 
         Ok(ret.trim().to_string())
@@ -3029,10 +3014,10 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
     // disabled by default is fine.
     //
     // `from` must be the last addr, see `receive_imf_inner()` why.
-    recipients.retain(|x| x.to_lowercase() != lowercase_from);
-    if (context.get_config_bool(Config::BccSelf).await?
-        || msg.param.get_cmd() == SystemMessage::AutocryptSetupMessage)
-        && (context.get_config_delete_server_after().await? != Some(0) || !recipients.is_empty())
+    if context.get_config_bool(Config::BccSelf).await?
+        && !recipients
+            .iter()
+            .any(|x| x.to_lowercase() == lowercase_from)
     {
         recipients.push(from);
     }
@@ -4890,7 +4875,6 @@ pub(crate) enum SyncAction {
     Rename(String),
     /// Set chat contacts by their addresses.
     SetContacts(Vec<String>),
-    Delete,
 }
 
 impl Context {
@@ -4950,7 +4934,6 @@ impl Context {
             }
             SyncAction::Rename(to) => rename_ex(self, Nosync, chat_id, to).await,
             SyncAction::SetContacts(addrs) => set_contacts_by_addrs(self, chat_id, addrs).await,
-            SyncAction::Delete => chat_id.delete_ex(self, Nosync).await,
         }
     }
 

src/chat/chat_tests.rs

@@ -299,6 +299,10 @@ async fn test_member_add_remove() -> Result<()> {
     let alice = tcm.alice().await;
     let bob = tcm.bob().await;
 
+    // Disable encryption so we can inspect raw message contents.
+    alice.set_config(Config::E2eeEnabled, Some("0")).await?;
+    bob.set_config(Config::E2eeEnabled, Some("0")).await?;
+
     // Create contact for Bob on the Alice side with name "robert".
     let alice_bob_contact_id = Contact::create(&alice, "robert", "bob@example.net").await?;
 
@@ -369,6 +373,9 @@ async fn test_parallel_member_remove() -> Result<()> {
     let alice = tcm.alice().await;
     let bob = tcm.bob().await;
 
+    alice.set_config(Config::E2eeEnabled, Some("0")).await?;
+    bob.set_config(Config::E2eeEnabled, Some("0")).await?;
+
     let alice_bob_contact_id = Contact::create(&alice, "Bob", "bob@example.net").await?;
     let alice_fiona_contact_id = Contact::create(&alice, "Fiona", "fiona@example.net").await?;
     let alice_claire_contact_id = Contact::create(&alice, "Claire", "claire@example.net").await?;
@@ -1876,6 +1883,10 @@ async fn test_sticker(
     msg.set_file_and_deduplicate(&alice, &file, Some(filename), None)?;
 
     let sent_msg = alice.send_msg(alice_chat.id, &mut msg).await;
+    let mime = sent_msg.payload();
+    if res_viewtype == Viewtype::Sticker {
+        assert_eq!(mime.match_indices("Chat-Content: sticker").count(), 1);
+    }
 
     let msg = bob.recv_msg(&sent_msg).await;
     assert_eq!(msg.chat_id, bob_chat.id);
@@ -2670,10 +2681,11 @@ async fn test_chat_get_encryption_info() -> Result<()> {
         "No encryption:\n\
             fiona@example.net\n\
             \n\
-            End-to-end encryption available:\n\
+            End-to-end encryption preferred:\n\
             bob@example.net"
     );
 
+    bob.set_config(Config::E2eeEnabled, Some("0")).await?;
     send_text_msg(&bob, direct_chat.id, "Hello!".to_string()).await?;
     alice.recv_msg(&bob.pop_sent_msg().await).await;
 
@@ -2964,24 +2976,15 @@ async fn test_sync_accept_before_first_msg() -> Result<()> {
 
     let ba_chat = bob.create_chat(alice0).await;
     let sent_msg = bob.send_text(ba_chat.id, "hi").await;
-    let rcvd_msg = alice0.recv_msg(&sent_msg).await;
-    let a0b_chat_id = rcvd_msg.chat_id;
-    let a0b_contact_id = rcvd_msg.from_id;
-    assert_eq!(
-        Chat::load_from_db(alice0, a0b_chat_id).await?.blocked,
-        Blocked::Request
-    );
+    let a0b_chat_id = alice0.recv_msg(&sent_msg).await.chat_id;
+    assert_eq!(alice0.get_chat(&bob).await.blocked, Blocked::Request);
     a0b_chat_id.accept(alice0).await?;
-    let a0b_contact = Contact::get_by_id(alice0, a0b_contact_id).await?;
+    let a0b_contact = alice0.add_or_lookup_contact(&bob).await;
     assert_eq!(a0b_contact.origin, Origin::CreateChat);
     assert_eq!(alice0.get_chat(&bob).await.blocked, Blocked::Not);
 
     sync(alice0, alice1).await;
-    let alice1_contacts = Contact::get_all(alice1, 0, None).await?;
-    assert_eq!(alice1_contacts.len(), 1);
-    let a1b_contact_id = alice1_contacts[0];
-    let a1b_contact = Contact::get_by_id(alice1, a1b_contact_id).await?;
-    assert_eq!(a1b_contact.get_addr(), "bob@example.net");
+    let a1b_contact = alice1.add_or_lookup_contact(&bob).await;
     assert_eq!(a1b_contact.origin, Origin::CreateChat);
     let a1b_chat = alice1.get_chat(&bob).await;
     assert_eq!(a1b_chat.blocked, Blocked::Not);
@@ -3004,22 +3007,22 @@ async fn test_sync_block_before_first_msg() -> Result<()> {
 
     let ba_chat = bob.create_chat(alice0).await;
     let sent_msg = bob.send_text(ba_chat.id, "hi").await;
-    let rcvd_msg = alice0.recv_msg(&sent_msg).await;
-    let a0b_chat_id = rcvd_msg.chat_id;
-    let a0b_contact_id = rcvd_msg.from_id;
+    let a0b_chat_id = alice0.recv_msg(&sent_msg).await.chat_id;
     assert_eq!(alice0.get_chat(&bob).await.blocked, Blocked::Request);
     a0b_chat_id.block(alice0).await?;
-    let a0b_contact = Contact::get_by_id(alice0, a0b_contact_id).await?;
+    let a0b_contact = alice0.add_or_lookup_contact(&bob).await;
     assert_eq!(a0b_contact.origin, Origin::IncomingUnknownFrom);
     assert_eq!(alice0.get_chat(&bob).await.blocked, Blocked::Yes);
 
     sync(alice0, alice1).await;
-    let alice1_contacts = Contact::get_all(alice1, 0, None).await?;
-    assert_eq!(alice1_contacts.len(), 0);
+    let a1b_contact = alice1.add_or_lookup_contact(&bob).await;
+    assert_eq!(a1b_contact.origin, Origin::Hidden);
+    assert!(ChatIdBlocked::lookup_by_contact(alice1, a1b_contact.id)
+        .await?
+        .is_none());
 
     let rcvd_msg = alice1.recv_msg(&sent_msg).await;
-    let a1b_contact_id = rcvd_msg.from_id;
-    let a1b_contact = Contact::get_by_id(alice1, a1b_contact_id).await?;
+    let a1b_contact = alice1.add_or_lookup_contact(&bob).await;
     assert_eq!(a1b_contact.origin, Origin::IncomingUnknownFrom);
     let a1b_chat = alice1.get_chat(&bob).await;
     assert_eq!(a1b_chat.blocked, Blocked::Yes);
@@ -3027,48 +3030,6 @@ async fn test_sync_block_before_first_msg() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_sync_delete_chat() -> Result<()> {
-    let alice0 = &TestContext::new_alice().await;
-    let alice1 = &TestContext::new_alice().await;
-    for a in [alice0, alice1] {
-        a.set_config_bool(Config::SyncMsgs, true).await?;
-    }
-    let bob = TestContext::new_bob().await;
-
-    let ba_chat = bob.create_chat(alice0).await;
-    let sent_msg = bob.send_text(ba_chat.id, "hi").await;
-    let a0b_chat_id = alice0.recv_msg(&sent_msg).await.chat_id;
-    let a1b_chat_id = alice1.recv_msg(&sent_msg).await.chat_id;
-    a0b_chat_id.accept(alice0).await?;
-    sync(alice0, alice1).await;
-    a0b_chat_id.delete(alice0).await?;
-    sync(alice0, alice1).await;
-    alice1.assert_no_chat(a1b_chat_id).await;
-    alice1
-        .evtracker
-        .get_matching(|evt| matches!(evt, EventType::ChatDeleted { .. }))
-        .await;
-
-    let bob_grp_chat_id = bob
-        .create_group_with_members(ProtectionStatus::Unprotected, "grp", &[alice0])
-        .await;
-    let sent_msg = bob.send_text(bob_grp_chat_id, "hi").await;
-    let a0_grp_chat_id = alice0.recv_msg(&sent_msg).await.chat_id;
-    let a1_grp_chat_id = alice1.recv_msg(&sent_msg).await.chat_id;
-    a0_grp_chat_id.accept(alice0).await?;
-    sync(alice0, alice1).await;
-    a0_grp_chat_id.delete(alice0).await?;
-    sync(alice0, alice1).await;
-    alice1.assert_no_chat(a1_grp_chat_id).await;
-    alice0
-        .evtracker
-        .get_matching(|evt| matches!(evt, EventType::ChatDeleted { .. }))
-        .await;
-
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_sync_adhoc_grp() -> Result<()> {
     let alice0 = &TestContext::new_alice().await;
@@ -3251,10 +3212,6 @@ async fn test_sync_broadcast() -> Result<()> {
     assert!(get_past_chat_contacts(alice1, a1_broadcast_id)
         .await?
         .is_empty());
-
-    a0_broadcast_id.delete(alice0).await?;
-    sync(alice0, alice1).await;
-    alice1.assert_no_chat(a1_broadcast_id).await;
     Ok(())
 }
 
@@ -3886,20 +3843,3 @@ async fn test_send_delete_request() -> Result<()> {
 
     Ok(())
 }
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_send_delete_request_no_encryption() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let alice_chat = alice.create_email_chat(bob).await;
-
-    // Alice sends a message, then tries to send a deletion request which fails.
-    let sent1 = alice.send_text(alice_chat.id, "wtf").await;
-    assert!(message::delete_msgs_ex(alice, &[sent1.sender_msg_id], true)
-        .await
-        .is_err());
-    sent1.load_from_db().await;
-    assert_eq!(alice_chat.id.get_msg_cnt(alice).await?, 1);
-    Ok(())
-}

src/chatlist.rs

@@ -407,17 +407,16 @@ impl Chatlist {
         let lastcontact = if let Some(lastmsg) = &lastmsg {
             if lastmsg.from_id == ContactId::SELF {
                 None
-            } else if chat.typ == Chattype::Group
-                || chat.typ == Chattype::Broadcast
-                || chat.typ == Chattype::Mailinglist
-                || chat.is_self_talk()
-            {
-                let lastcontact = Contact::get_by_id(context, lastmsg.from_id)
-                    .await
-                    .context("loading contact failed")?;
-                Some(lastcontact)
             } else {
-                None
+                match chat.typ {
+                    Chattype::Group | Chattype::Broadcast | Chattype::Mailinglist => {
+                        let lastcontact = Contact::get_by_id(context, lastmsg.from_id)
+                            .await
+                            .context("loading contact failed")?;
+                        Some(lastcontact)
+                    }
+                    Chattype::Single => None,
+                }
             }
         } else {
             None
@@ -480,7 +479,6 @@ pub async fn get_last_message_for_chat(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::chat::save_msgs;
     use crate::chat::{
         add_contact_to_chat, create_group_chat, get_chat_contacts, remove_contact_from_chat,
         send_text_msg, ProtectionStatus,
@@ -488,7 +486,6 @@ mod tests {
     use crate::receive_imf::receive_imf;
     use crate::stock_str::StockMessage;
     use crate::test_utils::TestContext;
-    use crate::test_utils::TestContextManager;
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_try_load() {
@@ -790,31 +787,6 @@ mod tests {
         assert!(summary_res.is_ok());
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_get_summary_for_saved_messages() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = tcm.alice().await;
-        let bob = tcm.bob().await;
-        let chat_alice = alice.create_chat(&bob).await;
-
-        send_text_msg(&alice, chat_alice.id, "hi".into()).await?;
-        let sent1 = alice.pop_sent_msg().await;
-        save_msgs(&alice, &[sent1.sender_msg_id]).await?;
-        let chatlist = Chatlist::try_load(&alice, 0, None, None).await?;
-        let summary = chatlist.get_summary(&alice, 0, None).await?;
-        assert_eq!(summary.prefix.unwrap().to_string(), "Me");
-        assert_eq!(summary.text, "hi");
-
-        let msg = bob.recv_msg(&sent1).await;
-        save_msgs(&bob, &[msg.id]).await?;
-        let chatlist = Chatlist::try_load(&bob, 0, None, None).await?;
-        let summary = chatlist.get_summary(&bob, 0, None).await?;
-        assert_eq!(summary.prefix.unwrap().to_string(), "alice@example.org");
-        assert_eq!(summary.text, "hi");
-
-        Ok(())
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_load_broken() {
         let t = TestContext::new_bob().await;

src/config.rs

@@ -193,6 +193,10 @@ pub enum Config {
     #[strum(props(default = "1"))]
     FetchedExistingMsgs,
 
+    /// Type of the OpenPGP key to generate.
+    #[strum(props(default = "0"))]
+    KeyGenType,
+
     /// Timer in seconds after which the message is deleted from the
     /// server.
     ///
@@ -216,6 +220,9 @@ pub enum Config {
     /// `ProviderOptions::delete_to_trash`.
     DeleteToTrash,
 
+    /// Save raw MIME messages with headers in the database if true.
+    SaveMimeHeaders,
+
     /// The primary email address. Also see `SecondaryAddrs`.
     ConfiguredAddr,
 
@@ -709,6 +716,7 @@ impl Context {
             | Config::OnlyFetchMvbox
             | Config::FetchExistingMsgs
             | Config::DeleteToTrash
+            | Config::SaveMimeHeaders
             | Config::Configured
             | Config::Bot
             | Config::NotifyAboutWrongPw

src/config/config_tests.rs

@@ -86,7 +86,7 @@ async fn test_set_config_bool() -> Result<()> {
     let t = TestContext::new().await;
 
     // We need some config that defaults to true
-    let c = Config::MdnsEnabled;
+    let c = Config::E2eeEnabled;
     assert_eq!(t.get_config_bool(c).await?, true);
     t.set_config_bool(c, false).await?;
     assert_eq!(t.get_config_bool(c).await?, false);

src/configure.rs

@@ -28,15 +28,13 @@ use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT;
 use crate::context::Context;
 use crate::imap::Imap;
 use crate::log::LogExt;
-pub use crate::login_param::EnteredLoginParam;
 use crate::login_param::{
     ConfiguredCertificateChecks, ConfiguredLoginParam, ConfiguredServerLoginParam,
-    ConnectionCandidate, EnteredCertificateChecks, ProxyConfig,
+    ConnectionCandidate, EnteredCertificateChecks, EnteredLoginParam,
 };
 use crate::message::Message;
 use crate::oauth2::get_oauth2_addr;
 use crate::provider::{Protocol, Socket, UsernamePattern};
-use crate::qr::set_account_from_qr;
 use crate::smtp::Smtp;
 use crate::sync::Sync::*;
 use crate::tools::time;
@@ -66,59 +64,8 @@ impl Context {
         self.sql.get_raw_config_bool("configured").await
     }
 
-    /// Configures this account with the currently provided parameters.
-    ///
-    /// Deprecated since 2025-02; use `add_transport_from_qr()`
-    /// or `add_transport()` instead.
+    /// Configures this account with the currently set parameters.
     pub async fn configure(&self) -> Result<()> {
-        let param = EnteredLoginParam::load(self).await?;
-
-        self.add_transport_inner(&param).await
-    }
-
-    /// Configures a new email account using the provided parameters
-    /// and adds it as a transport.
-    ///
-    /// If the email address is the same as an existing transport,
-    /// then this existing account will be reconfigured instead of a new one being added.
-    ///
-    /// This function stops and starts IO as needed.
-    ///
-    /// Usually it will be enough to only set `addr` and `imap.password`,
-    /// and all the other settings will be autoconfigured.
-    ///
-    /// During configuration, ConfigureProgress events are emitted;
-    /// they indicate a successful configuration as well as errors
-    /// and may be used to create a progress bar.
-    /// This function will return after configuration is finished.
-    ///
-    /// If configuration is successful,
-    /// the working server parameters will be saved
-    /// and used for connecting to the server.
-    /// The parameters entered by the user will be saved separately
-    /// so that they can be prefilled when the user opens the server-configuration screen again.
-    ///
-    /// See also:
-    /// - [Self::is_configured()] to check whether there is
-    ///   at least one working transport.
-    /// - [Self::add_transport_from_qr()] to add a transport
-    ///   from a server encoded in a QR code.
-    /// - [Self::list_transports()] to get a list of all configured transports.
-    /// - [Self::delete_transport()] to remove a transport.
-    pub async fn add_transport(&self, param: &EnteredLoginParam) -> Result<()> {
-        self.stop_io().await;
-        let result = self.add_transport_inner(param).await;
-        if result.is_err() {
-            if let Ok(true) = self.is_configured().await {
-                self.start_io().await;
-            }
-            return result;
-        }
-        self.start_io().await;
-        Ok(())
-    }
-
-    async fn add_transport_inner(&self, param: &EnteredLoginParam) -> Result<()> {
         ensure!(
             !self.scheduler.is_running().await,
             "cannot configure, already running"
@@ -127,63 +74,42 @@ impl Context {
             self.sql.is_open().await,
             "cannot configure, database not opened."
         );
-        let old_addr = self.get_config(Config::ConfiguredAddr).await?;
-        if self.is_configured().await? && !addr_cmp(&old_addr.unwrap_or_default(), &param.addr) {
-            bail!("Adding a new transport is not supported right now. Check back in a few months!");
-        }
         let cancel_channel = self.alloc_ongoing().await?;
 
         let res = self
-            .inner_configure(param)
+            .inner_configure()
             .race(cancel_channel.recv().map(|_| Err(format_err!("Cancelled"))))
             .await;
 
         self.free_ongoing().await;
 
         if let Err(err) = res.as_ref() {
-            // We are using Anyhow's .context() and to show the
-            // inner error, too, we need the {:#}:
-            let error_msg = stock_str::configuration_failed(self, &format!("{err:#}")).await;
-            progress!(self, 0, Some(error_msg));
+            progress!(
+                self,
+                0,
+                Some(
+                    stock_str::configuration_failed(
+                        self,
+                        // We are using Anyhow's .context() and to show the
+                        // inner error, too, we need the {:#}:
+                        &format!("{err:#}"),
+                    )
+                    .await
+                )
+            );
         } else {
-            param.save(self).await?;
             progress!(self, 1000);
         }
 
         res
     }
 
-    /// Adds a new email account as a transport
-    /// using the server encoded in the QR code.
-    /// See [Self::add_transport].
-    pub async fn add_transport_from_qr(&self, qr: &str) -> Result<()> {
-        set_account_from_qr(self, qr).await?;
-        self.configure().await?;
-
-        Ok(())
-    }
-
-    /// Returns the list of all email accounts that are used as a transport in the current profile.
-    /// Use [Self::add_transport()] to add or change a transport
-    /// and [Self::delete_transport()] to delete a transport.
-    pub async fn list_transports(&self) -> Result<Vec<EnteredLoginParam>> {
-        let param = EnteredLoginParam::load(self).await?;
-
-        Ok(vec![param])
-    }
-
-    /// Removes the transport with the specified email address
-    /// (i.e. [EnteredLoginParam::addr]).
-    #[expect(clippy::unused_async)]
-    pub async fn delete_transport(&self, _addr: &str) -> Result<()> {
-        bail!("Adding and removing additional transports is not supported yet. Check back in a few months!")
-    }
-
-    async fn inner_configure(&self, param: &EnteredLoginParam) -> Result<()> {
+    async fn inner_configure(&self) -> Result<()> {
         info!(self, "Configure ...");
 
+        let param = EnteredLoginParam::load(self).await?;
         let old_addr = self.get_config(Config::ConfiguredAddr).await?;
-        let configured_param = configure(self, param).await?;
+        let configured_param = configure(self, &param).await?;
         self.set_config_internal(Config::NotifyAboutWrongPw, Some("1"))
             .await?;
         on_configure_completed(self, configured_param, old_addr).await?;
@@ -259,7 +185,8 @@ async fn get_configured_param(
         param.smtp.password.clone()
     };
 
-    let proxy_enabled = ctx.get_config_bool(Config::ProxyEnabled).await?;
+    let proxy_config = param.proxy_config.clone();
+    let proxy_enabled = proxy_config.is_some();
 
     let mut addr = param.addr.clone();
     if param.oauth2 {
@@ -418,7 +345,7 @@ async fn get_configured_param(
             .collect(),
         smtp_user: param.smtp.user.clone(),
         smtp_password,
-        proxy_config: ProxyConfig::load(ctx).await?,
+        proxy_config: param.proxy_config.clone(),
         provider,
         certificate_checks: match param.certificate_checks {
             EnteredCertificateChecks::Automatic => ConfiguredCertificateChecks::Automatic,
@@ -515,6 +442,7 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Configure
         ctx.set_config(Config::MvboxMove, Some("0")).await?;
         ctx.set_config(Config::OnlyFetchMvbox, None).await?;
         ctx.set_config(Config::ShowEmails, None).await?;
+        ctx.set_config(Config::E2eeEnabled, Some("1")).await?;
     }
 
     let create_mvbox = !is_chatmail;

src/constants.rs

@@ -58,6 +58,25 @@ pub enum MediaQuality {
     Worse = 1,
 }
 
+/// Type of the key to generate.
+#[derive(
+    Debug, Default, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql,
+)]
+#[repr(u8)]
+pub enum KeyGenType {
+    #[default]
+    Default = 0,
+
+    /// 2048-bit RSA.
+    Rsa2048 = 1,
+
+    /// [Ed25519](https://ed25519.cr.yp.to/) signature and X25519 encryption.
+    Ed25519 = 2,
+
+    /// 4096-bit RSA.
+    Rsa4096 = 3,
+}
+
 /// Video chat URL type.
 #[derive(
     Debug, Default, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql,
@@ -185,11 +204,9 @@ pub(crate) const DC_FETCH_EXISTING_MSGS_COUNT: i64 = 100;
 pub const BALANCED_IMAGE_BYTES: usize = 500_000;
 pub const WORSE_IMAGE_BYTES: usize = 130_000;
 
-// max. width/height and bytes of an avatar
-pub(crate) const BALANCED_AVATAR_SIZE: u32 = 512;
-pub(crate) const BALANCED_AVATAR_BYTES: usize = 60_000;
+// max. width/height of an avatar
+pub(crate) const BALANCED_AVATAR_SIZE: u32 = 256;
 pub(crate) const WORSE_AVATAR_SIZE: u32 = 128;
-pub(crate) const WORSE_AVATAR_BYTES: usize = 20_000; // this also fits to Outlook servers don't allowing headers larger than 32k.
 
 // max. width/height of images scaled down because of being too huge
 pub const BALANCED_IMAGE_SIZE: u32 = 1280;
@@ -236,6 +253,16 @@ mod tests {
         assert_eq!(Chattype::Broadcast, Chattype::from_i32(160).unwrap());
     }
 
+    #[test]
+    fn test_keygentype_values() {
+        // values may be written to disk and must not change
+        assert_eq!(KeyGenType::Default, KeyGenType::default());
+        assert_eq!(KeyGenType::Default, KeyGenType::from_i32(0).unwrap());
+        assert_eq!(KeyGenType::Rsa2048, KeyGenType::from_i32(1).unwrap());
+        assert_eq!(KeyGenType::Ed25519, KeyGenType::from_i32(2).unwrap());
+        assert_eq!(KeyGenType::Rsa4096, KeyGenType::from_i32(3).unwrap());
+    }
+
     #[test]
     fn test_showemails_values() {
         // values may be written to disk and must not change

src/contact/contact_tests.rs

@@ -1207,16 +1207,16 @@ async fn test_reset_encryption() -> Result<()> {
     let alice = &tcm.alice().await;
     let bob = &tcm.bob().await;
 
-    let msg = tcm.send_recv_accept(bob, alice, "Hi!").await;
-    assert_eq!(msg.get_showpadlock(), true);
+    let msg = tcm.send_recv_accept(alice, bob, "Hello!").await;
+    assert_eq!(msg.get_showpadlock(), false);
 
-    let alice_bob_chat_id = msg.chat_id;
+    let msg = tcm.send_recv(bob, alice, "Hi!").await;
+    assert_eq!(msg.get_showpadlock(), true);
     let alice_bob_contact_id = msg.from_id;
 
     alice_bob_contact_id.reset_encryption(alice).await?;
 
-    let sent = alice.send_text(alice_bob_chat_id, "Unencrypted").await;
-    let msg = bob.recv_msg(&sent).await;
+    let msg = tcm.send_recv(alice, bob, "Unencrypted").await;
     assert_eq!(msg.get_showpadlock(), false);
 
     Ok(())
@@ -1235,7 +1235,6 @@ async fn test_reset_verified_encryption() -> Result<()> {
 
     let alice_bob_chat_id = msg.chat_id;
     let alice_bob_contact_id = msg.from_id;
-
     alice_bob_contact_id.reset_encryption(alice).await?;
 
     // Check that the contact is still verified after resetting encryption.
@@ -1251,8 +1250,7 @@ async fn test_reset_verified_encryption() -> Result<()> {
         "bob@example.net sent a message from another device."
     );
 
-    let sent = alice.send_text(alice_bob_chat_id, "Unencrypted").await;
-    let msg = bob.recv_msg(&sent).await;
+    let msg = tcm.send_recv(alice, bob, "Unencrypted").await;
     assert_eq!(msg.get_showpadlock(), false);
 
     Ok(())

src/context.rs

@@ -919,6 +919,12 @@ impl Context {
             "show_emails",
             self.get_config_int(Config::ShowEmails).await?.to_string(),
         );
+        res.insert(
+            "save_mime_headers",
+            self.get_config_bool(Config::SaveMimeHeaders)
+                .await?
+                .to_string(),
+        );
         res.insert(
             "download_limit",
             self.get_config_int(Config::DownloadLimit)
@@ -938,6 +944,10 @@ impl Context {
         res.insert("configured_trash_folder", configured_trash_folder);
         res.insert("mdns_enabled", mdns_enabled.to_string());
         res.insert("e2ee_enabled", e2ee_enabled.to_string());
+        res.insert(
+            "key_gen_type",
+            self.get_config_int(Config::KeyGenType).await?.to_string(),
+        );
         res.insert("bcc_self", bcc_self.to_string());
         res.insert("sync_msgs", sync_msgs.to_string());
         res.insert("disable_idle", disable_idle.to_string());

src/e2ee.rs

@@ -54,13 +54,22 @@ impl EncryptHelper {
         peerstates: &[(Option<Peerstate>, String)],
     ) -> Result<bool> {
         let is_chatmail = context.is_chatmail().await?;
-        let mut prefer_encrypt_count = 1;
+        let mut prefer_encrypt_count = if self.prefer_encrypt == EncryptPreference::Mutual {
+            1
+        } else {
+            0
+        };
         for (peerstate, addr) in peerstates {
             match peerstate {
                 Some(peerstate) => {
+                    let prefer_encrypt = peerstate.prefer_encrypt;
+                    info!(context, "Peerstate for {addr:?} is {prefer_encrypt}.");
                     if match peerstate.prefer_encrypt {
-                        EncryptPreference::Reset => is_chatmail,
-                        EncryptPreference::NoPreference | EncryptPreference::Mutual => true,
+                        EncryptPreference::NoPreference | EncryptPreference::Reset => {
+                            (peerstate.prefer_encrypt != EncryptPreference::Reset || is_chatmail)
+                                && self.prefer_encrypt == EncryptPreference::Mutual
+                        }
+                        EncryptPreference::Mutual => true,
                     } {
                         prefer_encrypt_count += 1;
                     }
@@ -167,7 +176,6 @@ pub async fn ensure_secret_key_exists(context: &Context) -> Result<()> {
 mod tests {
     use super::*;
     use crate::chat::send_text_msg;
-    use crate::config::Config;
     use crate::key::DcKey;
     use crate::message::{Message, Viewtype};
     use crate::param::Param;
@@ -220,8 +228,8 @@ Sent with my Delta Chat Messenger: https://delta.chat";
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 
-        let chat_alice = alice.create_email_chat(&bob).await.id;
-        let chat_bob = bob.create_email_chat(&alice).await.id;
+        let chat_alice = alice.create_chat(&bob).await.id;
+        let chat_bob = bob.create_chat(&alice).await.id;
 
         // Alice sends unencrypted message to Bob
         let mut msg = Message::new(Viewtype::Text);
@@ -321,6 +329,7 @@ Sent with my Delta Chat Messenger: https://delta.chat";
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_should_encrypt() -> Result<()> {
         let t = TestContext::new_alice().await;
+        assert!(t.get_config_bool(Config::E2eeEnabled).await?);
         let encrypt_helper = EncryptHelper::new(&t).await.unwrap();
 
         let ps = new_peerstates(EncryptPreference::NoPreference);
@@ -343,6 +352,61 @@ Sent with my Delta Chat Messenger: https://delta.chat";
         Ok(())
     }
 
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_should_encrypt_e2ee_disabled() -> Result<()> {
+        let t = &TestContext::new_alice().await;
+        t.set_config_bool(Config::E2eeEnabled, false).await?;
+        let encrypt_helper = EncryptHelper::new(t).await.unwrap();
+
+        let ps = new_peerstates(EncryptPreference::NoPreference);
+        assert!(!encrypt_helper.should_encrypt(t, false, &ps).await?);
+
+        let ps = new_peerstates(EncryptPreference::Reset);
+        assert!(encrypt_helper.should_encrypt(t, true, &ps).await?);
+
+        let mut ps = new_peerstates(EncryptPreference::Mutual);
+        // Own preference is `NoPreference` and there's no majority with `Mutual`.
+        assert!(!encrypt_helper.should_encrypt(t, false, &ps).await?);
+        // Now the majority wants to encrypt. Let's encrypt, anyway there are other cases when we
+        // can't send unencrypted, e.g. protected groups.
+        ps.push(ps[0].clone());
+        assert!(encrypt_helper.should_encrypt(t, false, &ps).await?);
+
+        // Test with missing peerstate.
+        let ps = vec![(None, "bob@foo.bar".to_string())];
+        assert!(encrypt_helper.should_encrypt(t, true, &ps).await.is_err());
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_chatmail_prefers_to_encrypt() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+        let alice = &tcm.alice().await;
+        let bob = &tcm.bob().await;
+        bob.set_config_bool(Config::IsChatmail, true).await?;
+
+        let bob_chat_id = tcm
+            .send_recv_accept(alice, bob, "Hello from DC")
+            .await
+            .chat_id;
+        receive_imf(
+            bob,
+            b"From: alice@example.org\n\
+            To: bob@example.net\n\
+            Message-ID: <2222@example.org>\n\
+            Date: Sun, 22 Mar 3000 22:37:58 +0000\n\
+            \n\
+            Hello from another MUA\n",
+            false,
+        )
+        .await?;
+        send_text_msg(bob, bob_chat_id, "hi".to_string()).await?;
+        let sent_msg = bob.pop_sent_msg().await;
+        let msg = Message::load_from_db(bob, sent_msg.sender_msg_id).await?;
+        assert!(msg.get_showpadlock());
+        Ok(())
+    }
+
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_chatmail_can_send_unencrypted() -> Result<()> {
         let mut tcm = TestContextManager::new();

src/events/payload.rs

@@ -219,12 +219,6 @@ pub enum EventType {
         timer: EphemeralTimer,
     },
 
-    /// Chat was deleted.
-    ChatDeleted {
-        /// Chat ID.
-        chat_id: ChatId,
-    },
-
     /// Contact(s) created, renamed, blocked, deleted or changed their "recently seen" status.
     ///
     /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.

src/fuzzing.rs

@@ -0,0 +1,12 @@
+//! # Fuzzing module.
+//!
+//! This module exposes private APIs for fuzzing.
+
+/// Fuzzing target for simplify().
+///
+/// Calls simplify() and panics if simplify() panics.
+/// Does not return any value to avoid exposing internal crate types.
+#[cfg(fuzzing)]
+pub fn simplify(input: String, is_chat_message: bool) {
+    crate::simplify::simplify(input, is_chat_message);
+}

src/imex/key_transfer.rs

@@ -46,11 +46,11 @@ pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
     msg.force_plaintext();
     msg.param.set_int(Param::SkipAutocrypt, 1);
 
+    chat::send_msg(context, chat_id, &mut msg).await?;
+
     // Enable BCC-self, because transferring a key
     // means we have a multi-device setup.
     context.set_config_bool(Config::BccSelf, true).await?;
-
-    chat::send_msg(context, chat_id, &mut msg).await?;
     Ok(setup_code)
 }
 

src/imex/transfer.rs

@@ -45,7 +45,7 @@ use crate::message::Message;
 use crate::qr::Qr;
 use crate::stock_str::backup_transfer_msg_body;
 use crate::tools::{create_id, time, TempPathGuard};
-use crate::{e2ee, EventType};
+use crate::EventType;
 
 use super::{export_backup_stream, export_database, import_backup_stream, DBFILE_BACKUP_NAME};
 
@@ -109,11 +109,6 @@ impl BackupProvider {
             .parent()
             .context("Context dir not found")?;
 
-        // before we export, make sure the private key exists
-        e2ee::ensure_secret_key_exists(context)
-            .await
-            .context("Cannot create private key or private key not available")?;
-
         let dbfile = context_dir.join(DBFILE_BACKUP_NAME);
         if fs::metadata(&dbfile).await.is_ok() {
             fs::remove_file(&dbfile).await?;

src/key.rs

@@ -7,6 +7,7 @@ use std::io::Cursor;
 use anyhow::{bail, ensure, Context as _, Result};
 use base64::Engine as _;
 use deltachat_contact_tools::EmailAddress;
+use num_traits::FromPrimitive;
 use pgp::composed::Deserializable;
 pub use pgp::composed::{SignedPublicKey, SignedSecretKey};
 use pgp::ser::Serialize;
@@ -14,6 +15,8 @@ use pgp::types::{PublicKeyTrait, SecretKeyTrait};
 use rand::thread_rng;
 use tokio::runtime::Handle;
 
+use crate::config::Config;
+use crate::constants::KeyGenType;
 use crate::context::Context;
 use crate::log::LogExt;
 use crate::pgp::KeyPair;
@@ -279,9 +282,11 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
         Some(key_pair) => Ok(key_pair),
         None => {
             let start = tools::Time::now();
-            info!(context, "Generating keypair.");
+            let keytype = KeyGenType::from_i32(context.get_config_int(Config::KeyGenType).await?)
+                .unwrap_or_default();
+            info!(context, "Generating keypair with type {}", keytype);
             let keypair = Handle::current()
-                .spawn_blocking(move || crate::pgp::create_keypair(addr))
+                .spawn_blocking(move || crate::pgp::create_keypair(addr, keytype))
                 .await??;
 
             store_self_keypair(context, &keypair).await?;
@@ -461,7 +466,6 @@ mod tests {
     use once_cell::sync::Lazy;
 
     use super::*;
-    use crate::config::Config;
     use crate::test_utils::{alice_keypair, TestContext};
 
     static KEYPAIR: Lazy<KeyPair> = Lazy::new(alice_keypair);

src/lib.rs

@@ -52,7 +52,7 @@ pub(crate) mod events;
 pub use events::*;
 
 mod aheader;
-pub mod blob;
+mod blob;
 pub mod chat;
 pub mod chatlist;
 pub mod config;
@@ -68,7 +68,7 @@ mod imap;
 pub mod imex;
 pub mod key;
 pub mod location;
-pub mod login_param;
+mod login_param;
 pub mod message;
 mod mimefactory;
 pub mod mimeparser;
@@ -116,3 +116,6 @@ pub const DCC_MIME_DEBUG: &str = "DCC_MIME_DEBUG";
 mod test_utils;
 #[cfg(test)]
 mod tests;
+
+#[cfg(fuzzing)]
+pub mod fuzzing;

src/login_param.rs

@@ -4,7 +4,6 @@ use std::fmt;
 
 use anyhow::{format_err, Context as _, Result};
 use deltachat_contact_tools::EmailAddress;
-use num_traits::ToPrimitive as _;
 use serde::{Deserialize, Serialize};
 
 use crate::config::Config;
@@ -12,11 +11,9 @@ use crate::configure::server_params::{expand_param_vector, ServerParams};
 use crate::constants::{DC_LP_AUTH_FLAGS, DC_LP_AUTH_NORMAL, DC_LP_AUTH_OAUTH2};
 use crate::context::Context;
 use crate::net::load_connection_timestamp;
-pub use crate::net::proxy::ProxyConfig;
-pub use crate::provider::Socket;
-use crate::provider::{Protocol, Provider, UsernamePattern};
+use crate::net::proxy::ProxyConfig;
+use crate::provider::{Protocol, Provider, Socket, UsernamePattern};
 use crate::sql::Sql;
-use crate::tools::ToOption;
 
 /// User-entered setting for certificate checks.
 ///
@@ -47,7 +44,7 @@ pub enum EnteredCertificateChecks {
 #[derive(Copy, Clone, Debug, Display, FromPrimitive, ToPrimitive, PartialEq, Eq)]
 #[repr(u32)]
 #[strum(serialize_all = "snake_case")]
-pub(crate) enum ConfiguredCertificateChecks {
+pub enum ConfiguredCertificateChecks {
     /// Use configuration from the provider database.
     /// If there is no provider database setting for certificate checks,
     /// accept invalid certificates.
@@ -119,13 +116,15 @@ pub struct EnteredLoginParam {
     /// invalid hostnames
     pub certificate_checks: EnteredCertificateChecks,
 
-    /// If true, login via OAUTH2 (not recommended anymore)
+    /// Proxy configuration.
+    pub proxy_config: Option<ProxyConfig>,
+
     pub oauth2: bool,
 }
 
 impl EnteredLoginParam {
     /// Loads entered account settings.
-    pub(crate) async fn load(context: &Context) -> Result<Self> {
+    pub async fn load(context: &Context) -> Result<Self> {
         let addr = context
             .get_config(Config::Addr)
             .await?
@@ -197,6 +196,8 @@ impl EnteredLoginParam {
             .unwrap_or_default();
         let oauth2 = matches!(server_flags & DC_LP_AUTH_FLAGS, DC_LP_AUTH_OAUTH2);
 
+        let proxy_config = ProxyConfig::load(context).await?;
+
         Ok(EnteredLoginParam {
             addr,
             imap: EnteredServerLoginParam {
@@ -214,71 +215,10 @@ impl EnteredLoginParam {
                 password: send_pw,
             },
             certificate_checks,
+            proxy_config,
             oauth2,
         })
     }
-
-    /// Saves entered account settings,
-    /// so that they can be prefilled if the user wants to configure the server again.
-    pub(crate) async fn save(&self, context: &Context) -> Result<()> {
-        context.set_config(Config::Addr, Some(&self.addr)).await?;
-
-        context
-            .set_config(Config::MailServer, self.imap.server.to_option())
-            .await?;
-        context
-            .set_config(Config::MailPort, self.imap.port.to_option().as_deref())
-            .await?;
-        context
-            .set_config(
-                Config::MailSecurity,
-                self.imap.security.to_i32().to_option().as_deref(),
-            )
-            .await?;
-        context
-            .set_config(Config::MailUser, self.imap.user.to_option())
-            .await?;
-        context
-            .set_config(Config::MailPw, self.imap.password.to_option())
-            .await?;
-
-        context
-            .set_config(Config::SendServer, self.smtp.server.to_option())
-            .await?;
-        context
-            .set_config(Config::SendPort, self.smtp.port.to_option().as_deref())
-            .await?;
-        context
-            .set_config(
-                Config::SendSecurity,
-                self.smtp.security.to_i32().to_option().as_deref(),
-            )
-            .await?;
-        context
-            .set_config(Config::SendUser, self.smtp.user.to_option())
-            .await?;
-        context
-            .set_config(Config::SendPw, self.smtp.password.to_option())
-            .await?;
-
-        context
-            .set_config(
-                Config::ImapCertificateChecks,
-                self.certificate_checks.to_i32().to_option().as_deref(),
-            )
-            .await?;
-
-        let server_flags = if self.oauth2 {
-            Some(DC_LP_AUTH_OAUTH2.to_string())
-        } else {
-            None
-        };
-        context
-            .set_config(Config::ServerFlags, server_flags.as_deref())
-            .await?;
-
-        Ok(())
-    }
 }
 
 impl fmt::Display for EnteredLoginParam {
@@ -379,7 +319,7 @@ impl TryFrom<Socket> for ConnectionSecurity {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub(crate) struct ConfiguredServerLoginParam {
+pub struct ConfiguredServerLoginParam {
     pub connection: ConnectionCandidate,
 
     /// Username.
@@ -417,7 +357,7 @@ pub(crate) async fn prioritize_server_login_params(
 /// Login parameters saved to the database
 /// after successful configuration.
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) struct ConfiguredLoginParam {
+pub struct ConfiguredLoginParam {
     /// `From:` address that was used at the time of configuration.
     pub addr: String,
 
@@ -450,7 +390,6 @@ pub(crate) struct ConfiguredLoginParam {
     /// invalid hostnames
     pub certificate_checks: ConfiguredCertificateChecks,
 
-    /// If true, login via OAUTH2 (not recommended anymore)
     pub oauth2: bool,
 }
 
@@ -489,7 +428,7 @@ impl ConfiguredLoginParam {
     /// Load configured account settings from the database.
     ///
     /// Returns `None` if account is not configured.
-    pub(crate) async fn load(context: &Context) -> Result<Option<Self>> {
+    pub async fn load(context: &Context) -> Result<Option<Self>> {
         if !context.get_config_bool(Config::Configured).await? {
             return Ok(None);
         }
@@ -760,7 +699,7 @@ impl ConfiguredLoginParam {
     }
 
     /// Save this loginparam to the database.
-    pub(crate) async fn save_as_configured_params(&self, context: &Context) -> Result<()> {
+    pub async fn save_as_configured_params(&self, context: &Context) -> Result<()> {
         context.set_primary_self_addr(&self.addr).await?;
 
         context
@@ -837,7 +776,7 @@ impl ConfiguredLoginParam {
         Ok(())
     }
 
-    pub(crate) fn strict_tls(&self) -> bool {
+    pub fn strict_tls(&self) -> bool {
         let provider_strict_tls = self.provider.map(|provider| provider.opt.strict_tls);
         match self.certificate_checks {
             ConfiguredCertificateChecks::OldAutomatic => {
@@ -900,42 +839,6 @@ mod tests {
         Ok(())
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_save_entered_login_param() -> Result<()> {
-        let t = TestContext::new().await;
-        let param = EnteredLoginParam {
-            addr: "alice@example.org".to_string(),
-            imap: EnteredServerLoginParam {
-                server: "".to_string(),
-                port: 0,
-                security: Socket::Starttls,
-                user: "".to_string(),
-                password: "foobar".to_string(),
-            },
-            smtp: EnteredServerLoginParam {
-                server: "".to_string(),
-                port: 2947,
-                security: Socket::default(),
-                user: "".to_string(),
-                password: "".to_string(),
-            },
-            certificate_checks: Default::default(),
-            oauth2: false,
-        };
-        param.save(&t).await?;
-        assert_eq!(
-            t.get_config(Config::Addr).await?.unwrap(),
-            "alice@example.org"
-        );
-        assert_eq!(t.get_config(Config::MailPw).await?.unwrap(), "foobar");
-        assert_eq!(t.get_config(Config::SendPw).await?, None);
-        assert_eq!(t.get_config_int(Config::SendPort).await?, 2947);
-
-        assert_eq!(EnteredLoginParam::load(&t).await?, param);
-
-        Ok(())
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_save_load_login_param() -> Result<()> {
         let t = TestContext::new().await;

src/message.rs

@@ -1313,10 +1313,37 @@ impl Message {
     /// UI can use this to show a symbol beside the message, indicating it was saved.
     /// The message can be un-saved by deleting the returned message.
     pub async fn get_saved_msg_id(&self, context: &Context) -> Result<Option<MsgId>> {
+        // We force usage of `msgs_index5`
+        // which indexes `msgs.starred` column
+        // using `unlikely()` here.
+        //
+        // Otherwise with SQLite 3.49.1
+        // if you run ANALYZE on the database
+        // that has no starred messages,
+        // query planner decides not to use the index:
+        //
+        // sqlite> EXPLAIN QUERY PLAN SELECT id FROM msgs WHERE starred=? AND chat_id!=?;
+        // QUERY PLAN
+        // `--SEARCH msgs USING INDEX msgs_index5 (starred=?)
+        // sqlite> ANALYZE;
+        // sqlite> EXPLAIN QUERY PLAN SELECT id FROM msgs WHERE starred=? AND chat_id!=?;
+        // QUERY PLAN
+        // `--SCAN msgs
+        //
+        // Dropping created sqlite_stat1 and sqlite_stat4 tables
+        // and reconnecting helps.
+        //
+        // Even if we don't run ANALYZE or PRAGMA OPTIMIZE
+        // as of 2025-02-28, ANALYZE is supposed to improve performance
+        // and this demonstrates a bug in the query planner.
+        //
+        // See <https://sqlite.org/queryplanner-ng.html#howtofix>
+        // and <https://sqlite.org/lang_corefunc.html#unlikely>
+        // for details.
         let res: Option<MsgId> = context
             .sql
             .query_get_value(
-                "SELECT id FROM msgs WHERE starred=? AND chat_id!=?",
+                "SELECT id FROM msgs WHERE unlikely(starred=?) AND chat_id!=?",
                 (self.id, DC_CHAT_ID_TRASH),
             )
             .await?;
@@ -1596,12 +1623,14 @@ pub(crate) fn guess_msgtype_from_path_suffix(path: &Path) -> Option<(Viewtype, &
 }
 
 /// Get the raw mime-headers of the given message.
-/// Raw headers are saved for large messages
-/// that need a "Show full message..."
-/// to see HTML part.
+/// Raw headers are saved for incoming messages
+/// only if `set_config(context, "save_mime_headers", "1")`
+/// was called before.
 ///
-/// Returns an empty vector if there are no headers saved for the given message.
-pub(crate) async fn get_mime_headers(context: &Context, msg_id: MsgId) -> Result<Vec<u8>> {
+/// Returns an empty vector if there are no headers saved for the given message,
+/// e.g. because of save_mime_headers is not set
+/// or the message is not incoming.
+pub async fn get_mime_headers(context: &Context, msg_id: MsgId) -> Result<Vec<u8>> {
     let (headers, compressed) = context
         .sql
         .query_row(
@@ -1760,10 +1789,6 @@ pub async fn delete_msgs_ex(
         );
         if let Some(chat_id) = modified_chat_ids.iter().next() {
             let mut msg = Message::new_text("🚮".to_owned());
-            // We don't want to send deletion requests in chats w/o encryption:
-            // - These are usually chats with non-DC clients who won't respect deletion requests
-            //   anyway and display a weird trash bin message instead.
-            // - Deletion of world-visible unencrypted messages seems not very useful.
             msg.param.set_int(Param::GuaranteeE2ee, 1);
             msg.param
                 .set(Param::DeleteRequestFor, deleted_rfc724_mid.join(" "));

src/mimefactory.rs

@@ -23,7 +23,7 @@ use crate::e2ee::EncryptHelper;
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::location;
 use crate::message::{self, Message, MsgId, Viewtype};
-use crate::mimeparser::{is_hidden, SystemMessage};
+use crate::mimeparser::SystemMessage;
 use crate::param::Param;
 use crate::peer_channels::create_iroh_header;
 use crate::peerstate::Peerstate;
@@ -184,6 +184,9 @@ impl MimeFactory {
         let mut req_mdn = false;
 
         if chat.is_self_talk() {
+            if msg.param.get_cmd() == SystemMessage::AutocryptSetupMessage {
+                recipients.push(from_addr.to_string());
+            }
             to.push((from_displayname.to_string(), from_addr.to_string()));
         } else if chat.is_mailing_list() {
             let list_post = chat
@@ -604,7 +607,10 @@ impl MimeFactory {
                 || to.len() + past_members.len() == self.member_timestamps.len()
         );
         if to.is_empty() {
-            to.push(hidden_recipients());
+            to.push(Address::new_group(
+                Some("hidden-recipients".to_string()),
+                Vec::new(),
+            ));
         }
 
         // Start with Internet Message Format headers in the order of the standard example
@@ -707,11 +713,12 @@ impl MimeFactory {
 
         if let Loaded::Message { chat, .. } = &self.loaded {
             if chat.typ == Chattype::Broadcast {
+                let encoded_chat_name = encode_words(&chat.name);
                 headers.push((
                     "List-ID",
-                    mail_builder::headers::text::Text::new(format!(
-                        "{} <{}>",
-                        chat.name, chat.grpid
+                    mail_builder::headers::raw::Raw::new(format!(
+                        "{encoded_chat_name} <{}>",
+                        chat.grpid
                     ))
                     .into(),
                 ));
@@ -828,13 +835,11 @@ impl MimeFactory {
         // placed here.
         let mut unprotected_headers: Vec<(&'static str, HeaderType<'static>)> = Vec::new();
 
-        // Headers that MUST NOT (only) go into IMF header section:
-        // - Large headers which may hit the header section size limit on the server, such as
-        //   Chat-User-Avatar with a base64-encoded image inside.
-        // - Headers duplicated here that servers mess up with in the IMF header section, like
-        //   Message-ID.
-        // - Nonstandard headers that should be DKIM-protected because e.g. OpenDKIM only signs
-        //   known headers.
+        // Headers that MUST NOT go into IMF header section.
+        //
+        // These are large headers which may hit the header section size limit on the server, such as
+        // Chat-User-Avatar with a base64-encoded image inside. Also there are headers duplicated here
+        // that servers mess up with in the IMF header section, like Message-ID.
         //
         // The header should be hidden from MTA
         // by moving it either into protected part
@@ -862,7 +867,10 @@ impl MimeFactory {
             if header_name == "message-id" {
                 unprotected_headers.push(header.clone());
                 hidden_headers.push(header.clone());
-            } else if is_hidden(&header_name) {
+            } else if header_name == "chat-user-avatar"
+                || header_name == "chat-delete"
+                || header_name == "chat-edit"
+            {
                 hidden_headers.push(header.clone());
             } else if header_name == "autocrypt"
                 && !context.get_config_bool(Config::ProtectAutocrypt).await?
@@ -881,23 +889,21 @@ impl MimeFactory {
             } else if header_name == "to" {
                 protected_headers.push(header.clone());
                 if is_encrypted {
-                    let mut to_without_names = to
-                        .clone()
-                        .into_iter()
-                        .filter_map(|header| match header {
-                            Address::Address(mb) => Some(Address::Address(EmailAddress {
-                                name: None,
-                                email: mb.email,
-                            })),
-                            _ => None,
-                        })
-                        .collect::<Vec<_>>();
-                    if to_without_names.is_empty() {
-                        to_without_names.push(hidden_recipients());
-                    }
                     unprotected_headers.push((
                         original_header_name,
-                        Address::new_list(to_without_names).into(),
+                        Address::new_list(
+                            to.clone()
+                                .into_iter()
+                                .filter_map(|header| match header {
+                                    Address::Address(mb) => Some(Address::Address(EmailAddress {
+                                        name: None,
+                                        email: mb.email,
+                                    })),
+                                    _ => None,
+                                })
+                                .collect::<Vec<_>>(),
+                        )
+                        .into(),
                     ));
                 } else {
                     unprotected_headers.push(header.clone());
@@ -1628,10 +1634,6 @@ impl MimeFactory {
     }
 }
 
-fn hidden_recipients() -> Address<'static> {
-    Address::new_group(Some("hidden-recipients".to_string()), Vec::new())
-}
-
 async fn build_body_file(context: &Context, msg: &Message) -> Result<MimePart<'static>> {
     let file_name = msg.get_filename().context("msg has no file")?;
     let suffix = Path::new(&file_name)
@@ -1747,5 +1749,13 @@ fn render_rfc724_mid(rfc724_mid: &str) -> String {
     }
 }
 
+/* ******************************************************************************
+ * Encode/decode header words, RFC 2047
+ ******************************************************************************/
+
+fn encode_words(word: &str) -> String {
+    encoded_words::encode(word, None, encoded_words::EncodingFlag::Shortest, None)
+}
+
 #[cfg(test)]
 mod mimefactory_tests;

src/mimefactory/mimefactory_tests.rs

@@ -5,7 +5,7 @@ use std::str;
 
 use super::*;
 use crate::chat::{
-    self, add_contact_to_chat, create_group_chat, remove_contact_from_chat, send_text_msg, ChatId,
+    add_contact_to_chat, create_group_chat, remove_contact_from_chat, send_text_msg, ChatId,
     ProtectionStatus,
 };
 use crate::chatlist::Chatlist;
@@ -622,43 +622,6 @@ async fn test_selfavatar_unencrypted() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_group_avatar_unencrypted() -> anyhow::Result<()> {
-    let t = &TestContext::new_alice().await;
-    let group_id = chat::create_group_chat(t, chat::ProtectionStatus::Unprotected, "Group")
-        .await
-        .unwrap();
-    let bob = Contact::create(t, "", "bob@example.org").await?;
-    chat::add_contact_to_chat(t, group_id, bob).await?;
-
-    let file = t.dir.path().join("avatar.png");
-    let bytes = include_bytes!("../../test-data/image/avatar64x64.png");
-    tokio::fs::write(&file, bytes).await?;
-    chat::set_chat_profile_image(t, group_id, file.to_str().unwrap()).await?;
-
-    // Send message to bob: that should get multipart/mixed because of the avatar moved to inner header.
-    let mut msg = Message::new_text("this is the text!".to_string());
-    let sent_msg = t.send_msg(group_id, &mut msg).await;
-    let mut payload = sent_msg.payload().splitn(3, "\r\n\r\n");
-
-    let outer = payload.next().unwrap();
-    let inner = payload.next().unwrap();
-    let body = payload.next().unwrap();
-
-    assert_eq!(outer.match_indices("multipart/mixed").count(), 1);
-    assert_eq!(outer.match_indices("Message-ID:").count(), 1);
-    assert_eq!(outer.match_indices("Subject:").count(), 1);
-    assert_eq!(outer.match_indices("Autocrypt:").count(), 1);
-    assert_eq!(outer.match_indices("Chat-Group-Avatar:").count(), 0);
-
-    assert_eq!(inner.match_indices("text/plain").count(), 1);
-    assert_eq!(inner.match_indices("Message-ID:").count(), 1);
-    assert_eq!(inner.match_indices("Chat-Group-Avatar:").count(), 1);
-
-    assert_eq!(body.match_indices("this is the text!").count(), 1);
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_selfavatar_unencrypted_signed() {
     // create chat with bob, set selfavatar
@@ -898,23 +861,3 @@ async fn test_dont_remove_self() -> Result<()> {
 
     Ok(())
 }
-
-/// Regression test: mimefactory should never create an empty to header,
-/// also not if the Selftalk parameter is missing
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_no_empty_to_header() -> Result<()> {
-    let alice = &TestContext::new_alice().await;
-    let mut self_chat = alice.get_self_chat().await;
-    self_chat.param.remove(Param::Selftalk);
-    self_chat.update_param(alice).await?;
-
-    let payload = alice.send_text(self_chat.id, "Hi").await.payload;
-    assert!(
-        // It would be equally fine if the payload contained `To: alice@example.org` or similar,
-        // as long as it's a valid header
-        payload.contains("To: \"hidden-recipients\": ;"),
-        "Payload doesn't contain correct To: header: {payload}"
-    );
-
-    Ok(())
-}

src/mimeparser.rs

@@ -253,7 +253,6 @@ impl MimeMessage {
             &mut chat_disposition_notification_to,
             &mail.headers,
         );
-        headers.retain(|k, _| !is_hidden(k));
 
         // Parse hidden headers.
         let mimetype = mail.ctype.mimetype.parse::<Mime>()?;
@@ -264,7 +263,7 @@ impl MimeMessage {
                     // messages are shown as unencrypted anyway.
 
                     timestamp_sent =
-                        Self::get_timestamp_sent(&part.headers, timestamp_sent, timestamp_rcvd);
+                        Self::get_timestamp_sent(&mail.headers, timestamp_sent, timestamp_rcvd);
                     MimeMessage::merge_headers(
                         context,
                         &mut headers,
@@ -288,7 +287,14 @@ impl MimeMessage {
             if let Some(part) = part.subparts.first() {
                 for field in &part.headers {
                     let key = field.get_key().to_lowercase();
-                    if !headers.contains_key(&key) && is_hidden(&key) || key == "message-id" {
+
+                    // For now only avatar headers can be hidden.
+                    if !headers.contains_key(&key)
+                        && (key == "chat-user-avatar"
+                            || key == "chat-group-avatar"
+                            || key == "chat-delete"
+                            || key == "chat-edit")
+                    {
                         headers.insert(key.to_string(), field.get_value());
                     }
                 }
@@ -345,13 +351,6 @@ impl MimeMessage {
                     }
 
                     decrypted_msg = Some(msg);
-
-                    timestamp_sent = Self::get_timestamp_sent(
-                        &decrypted_mail.headers,
-                        timestamp_sent,
-                        timestamp_rcvd,
-                    );
-
                     if let Some(protected_aheader_value) = decrypted_mail
                         .headers
                         .get_header_value(HeaderDef::Autocrypt)
@@ -423,7 +422,22 @@ impl MimeMessage {
             content
         });
         if let (Ok(mail), true) = (mail, encrypted) {
+            timestamp_sent =
+                Self::get_timestamp_sent(&mail.headers, timestamp_sent, timestamp_rcvd);
             if !signatures.is_empty() {
+                // Handle any gossip headers if the mail was encrypted. See section
+                // "3.6 Key Gossip" of <https://autocrypt.org/autocrypt-spec-1.1.0.pdf>
+                // but only if the mail was correctly signed. Probably it's ok to not require
+                // encryption here, but let's follow the standard.
+                let gossip_headers = mail.headers.get_all_values("Autocrypt-Gossip");
+                gossiped_keys = update_gossip_peerstates(
+                    context,
+                    timestamp_sent,
+                    &from.addr,
+                    &recipients,
+                    gossip_headers,
+                )
+                .await?;
                 // Remove unsigned opportunistically protected headers from messages considered
                 // Autocrypt-encrypted / displayed with padlock.
                 // For "Subject" see <https://github.com/deltachat/deltachat-core-rust/issues/1790>.
@@ -440,7 +454,6 @@ impl MimeMessage {
                     HeaderDef::ChatGroupPastMembers,
                     HeaderDef::ChatDelete,
                     HeaderDef::ChatEdit,
-                    HeaderDef::ChatUserAvatar,
                 ] {
                     headers.remove(h.get_headername());
                 }
@@ -464,22 +477,6 @@ impl MimeMessage {
                 &mail.headers,
             );
 
-            if !signatures.is_empty() {
-                // Handle any gossip headers if the mail was encrypted. See section
-                // "3.6 Key Gossip" of <https://autocrypt.org/autocrypt-spec-1.1.0.pdf>
-                // but only if the mail was correctly signed. Probably it's ok to not require
-                // encryption here, but let's follow the standard.
-                let gossip_headers = mail.headers.get_all_values("Autocrypt-Gossip");
-                gossiped_keys = update_gossip_peerstates(
-                    context,
-                    timestamp_sent,
-                    &from.addr,
-                    &recipients,
-                    gossip_headers,
-                )
-                .await?;
-            }
-
             if let Some(inner_from) = inner_from {
                 if !addr_cmp(&inner_from.addr, &from.addr) {
                     // There is a From: header in the encrypted
@@ -1990,14 +1987,6 @@ fn is_known(key: &str) -> bool {
     )
 }
 
-/// Returns if the header is hidden and must be ignored in the IMF section.
-pub(crate) fn is_hidden(key: &str) -> bool {
-    matches!(
-        key,
-        "chat-user-avatar" | "chat-group-avatar" | "chat-delete" | "chat-edit"
-    )
-}
-
 /// Parsed MIME part.
 #[derive(Debug, Default, Clone)]
 pub struct Part {

src/mimeparser/mimeparser_tests.rs

@@ -1,11 +1,10 @@
 use mailparse::ParsedMail;
-use std::mem;
 
 use super::*;
 use crate::{
     chat,
     chatlist::Chatlist,
-    constants::{self, Blocked, DC_DESIRED_TEXT_LEN, DC_ELLIPSIS},
+    constants::{Blocked, DC_DESIRED_TEXT_LEN, DC_ELLIPSIS},
     message::{MessageState, MessengerMessage},
     receive_imf::receive_imf,
     test_utils::{TestContext, TestContextManager},
@@ -1812,39 +1811,26 @@ async fn test_take_last_header() {
     );
 }
 
-async fn test_protect_autocrypt(enabled: bool) -> Result<()> {
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_protect_autocrypt() -> Result<()> {
     let mut tcm = TestContextManager::new();
     let alice = &tcm.alice().await;
     let bob = &tcm.bob().await;
 
-    let chat = alice.create_chat(bob).await;
     alice
-        .set_config_bool(Config::ProtectAutocrypt, enabled)
+        .set_config_bool(Config::ProtectAutocrypt, true)
         .await?;
-    let sent = alice.send_text(chat.id, "Hello!").await;
-    assert_eq!(sent.payload().contains("Autocrypt: "), !enabled);
-    let msg = bob.recv_msg(&sent).await;
+    bob.set_config_bool(Config::ProtectAutocrypt, true).await?;
+
+    let msg = tcm.send_recv_accept(alice, bob, "Hello!").await;
+    assert_eq!(msg.get_showpadlock(), false);
+
+    let msg = tcm.send_recv(bob, alice, "Hi!").await;
     assert_eq!(msg.get_showpadlock(), true);
 
     Ok(())
 }
 
-/// Tests that if `protect_autocrypt` is enabled,
-/// `Autocrypt` header does not appear in the outer headers
-/// of encrypted messages.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_protect_autocrypt_enabled() -> Result<()> {
-    test_protect_autocrypt(true).await
-}
-
-/// Tests that if `protect_autocrypt` is disabled,
-/// `Autocrypt` header appears in the outer headers
-/// of encrypted messages.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_protect_autocrypt_false() -> Result<()> {
-    test_protect_autocrypt(false).await
-}
-
 /// Tests that CRLF before MIME boundary
 /// is not treated as the part body.
 ///
@@ -1917,97 +1903,3 @@ This is the epilogue.  It is also to be ignored.";
         "This is explicitly typed plain US-ASCII text.\r\nIt DOES end with a linebreak.\r\n"
     );
 }
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_hidden_message_id() {
-    let t = &TestContext::new().await;
-    let raw = br#"Message-ID: bar@example.org
-Date: Sun, 08 Dec 2019 23:12:55 +0000
-To: <alice@example.org>
-From: <tunis4@example.org>
-Content-Type: multipart/mixed; boundary="luTiGu6GBoVLCvTkzVtmZmwsmhkNMw"
-
-
---luTiGu6GBoVLCvTkzVtmZmwsmhkNMw
-Message-ID: foo@example.org
-Content-Type: text/plain; charset=utf-8
-
-Message with a correct Message-ID hidden header
-
---luTiGu6GBoVLCvTkzVtmZmwsmhkNMw--
-"#;
-
-    let message = MimeMessage::from_bytes(t, &raw[..], None).await.unwrap();
-    assert_eq!(message.get_rfc724_mid().unwrap(), "foo@example.org");
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_chat_edit_imf_header() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let alice_chat = alice.create_email_chat(bob).await;
-
-    // Alice sends a message, then sends an invalid edit request.
-    let sent1 = alice.send_text(alice_chat.id, "foo").await;
-    let alice_msg = sent1.load_from_db().await;
-    assert_eq!(alice_chat.id.get_msg_cnt(alice).await?, 1);
-
-    chat::send_edit_request(alice, alice_msg.id, "bar".to_string()).await?;
-    let mut sent2 = alice.pop_sent_msg().await;
-    let mut s0 = String::new();
-    let mut s1 = String::new();
-    for l in sent2.payload.lines() {
-        if l.starts_with("Chat-Edit:") {
-            s1 += l;
-            s1 += "\n";
-            continue;
-        }
-        s0 += l;
-        s0 += "\n";
-        if l.starts_with("Message-ID:") && s1.is_empty() {
-            s1 = mem::take(&mut s0);
-        }
-    }
-    sent2.payload = s1 + &s0;
-
-    // Bob receives both messages, the edit request with "Chat-Edit" in IMF headers is
-    // received as text message.
-    let bob_msg = bob.recv_msg(&sent1).await;
-    assert_eq!(bob_msg.text, "foo");
-    assert_eq!(bob_msg.chat_id.get_msg_cnt(bob).await?, 1);
-    let bob_msg = bob.recv_msg(&sent2).await;
-    assert_eq!(bob_msg.text, constants::EDITED_PREFIX.to_string() + "bar");
-    assert_eq!(bob_msg.chat_id.get_msg_cnt(bob).await?, 2);
-
-    Ok(())
-}
-
-/// Tests that timestamp of signed but not encrypted message is protected.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_protected_date() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-
-    alice.set_config(Config::SignUnencrypted, Some("1")).await?;
-
-    let alice_chat = alice.create_email_chat(bob).await;
-    let alice_msg_id = chat::send_text_msg(alice, alice_chat.id, "Hello!".to_string()).await?;
-    let alice_msg = Message::load_from_db(alice, alice_msg_id).await?;
-    assert_eq!(alice_msg.get_showpadlock(), false);
-
-    let mut sent_msg = alice.pop_sent_msg().await;
-    sent_msg.payload = sent_msg.payload.replacen(
-        "Date:",
-        "Date: Wed, 17 Mar 2021 14:30:53 +0100 (CET)\r\nX-Not-Date:",
-        1,
-    );
-    let bob_msg = bob.recv_msg(&sent_msg).await;
-    assert_eq!(alice_msg.get_text(), bob_msg.get_text());
-
-    // Timestamp that the sender has put into the message
-    // should always be displayed as is on the receiver.
-    assert_eq!(alice_msg.get_timestamp(), bob_msg.get_timestamp());
-    Ok(())
-}

src/net/proxy.rs

@@ -154,21 +154,18 @@ impl Socks5Config {
     }
 }
 
-/// Configuration for the proxy through which all traffic
-/// (except for iroh p2p connections)
-/// will be sent.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ProxyConfig {
-    /// HTTP proxy.
+    // HTTP proxy.
     Http(HttpConfig),
 
-    /// HTTPS proxy.
+    // HTTPS proxy.
     Https(HttpConfig),
 
-    /// SOCKS5 proxy.
+    // SOCKS5 proxy.
     Socks5(Socks5Config),
 
-    /// Shadowsocks proxy.
+    // Shadowsocks proxy.
     Shadowsocks(ShadowsocksConfig),
 }
 
@@ -249,7 +246,7 @@ where
 
 impl ProxyConfig {
     /// Creates a new proxy configuration by parsing given proxy URL.
-    pub fn from_url(url: &str) -> Result<Self> {
+    pub(crate) fn from_url(url: &str) -> Result<Self> {
         let url = Url::parse(url).context("Cannot parse proxy URL")?;
         match url.scheme() {
             "http" => {
@@ -308,7 +305,7 @@ impl ProxyConfig {
     ///
     /// This function can be used to normalize proxy URL
     /// by parsing it and serializing back.
-    pub fn to_url(&self) -> String {
+    pub(crate) fn to_url(&self) -> String {
         match self {
             Self::Http(http_config) => http_config.to_url("http"),
             Self::Https(http_config) => http_config.to_url("https"),
@@ -394,7 +391,7 @@ impl ProxyConfig {
 
     /// If `load_dns_cache` is true, loads cached DNS resolution results.
     /// Use this only if the connection is going to be protected with TLS checks.
-    pub(crate) async fn connect(
+    pub async fn connect(
         &self,
         context: &Context,
         target_host: &str,

src/pgp.rs

@@ -18,6 +18,7 @@ use pgp::types::{CompressionAlgorithm, PublicKeyTrait, SignatureBytes, StringToK
 use rand::{thread_rng, CryptoRng, Rng};
 use tokio::runtime::Handle;
 
+use crate::constants::KeyGenType;
 use crate::key::{DcKey, Fingerprint};
 
 #[cfg(test)]
@@ -180,9 +181,15 @@ impl KeyPair {
 ///
 /// Both secret and public key consist of signing primary key and encryption subkey
 /// as [described in the Autocrypt standard](https://autocrypt.org/level1.html#openpgp-based-key-data).
-pub(crate) fn create_keypair(addr: EmailAddress) -> Result<KeyPair> {
-    let signing_key_type = PgpKeyType::EdDSALegacy;
-    let encryption_key_type = PgpKeyType::ECDH(ECCCurve::Curve25519);
+pub(crate) fn create_keypair(addr: EmailAddress, keygen_type: KeyGenType) -> Result<KeyPair> {
+    let (signing_key_type, encryption_key_type) = match keygen_type {
+        KeyGenType::Rsa2048 => (PgpKeyType::Rsa(2048), PgpKeyType::Rsa(2048)),
+        KeyGenType::Rsa4096 => (PgpKeyType::Rsa(4096), PgpKeyType::Rsa(4096)),
+        KeyGenType::Ed25519 | KeyGenType::Default => (
+            PgpKeyType::EdDSALegacy,
+            PgpKeyType::ECDH(ECCCurve::Curve25519),
+        ),
+    };
 
     let user_id = format!("<{addr}>");
     let key_params = SecretKeyParamsBuilder::default()
@@ -471,8 +478,16 @@ mod tests {
 
     #[test]
     fn test_create_keypair() {
-        let keypair0 = create_keypair(EmailAddress::new("foo@bar.de").unwrap()).unwrap();
-        let keypair1 = create_keypair(EmailAddress::new("two@zwo.de").unwrap()).unwrap();
+        let keypair0 = create_keypair(
+            EmailAddress::new("foo@bar.de").unwrap(),
+            KeyGenType::Default,
+        )
+        .unwrap();
+        let keypair1 = create_keypair(
+            EmailAddress::new("two@zwo.de").unwrap(),
+            KeyGenType::Default,
+        )
+        .unwrap();
         assert_ne!(keypair0.public, keypair1.public);
     }
 

src/qr.rs

@@ -695,7 +695,7 @@ struct CreateAccountErrorResponse {
 /// take a qr of the type DC_QR_ACCOUNT, parse it's parameters,
 /// download additional information from the contained url and set the parameters.
 /// on success, a configure::configure() should be able to log in to the account
-pub(crate) async fn set_account_from_qr(context: &Context, qr: &str) -> Result<()> {
+async fn set_account_from_qr(context: &Context, qr: &str) -> Result<()> {
     let url_str = qr
         .get(DCACCOUNT_SCHEME.len()..)
         .context("Invalid DCACCOUNT scheme")?;

src/receive_imf.rs

@@ -1405,6 +1405,10 @@ async fn add_parts(
     )
     .await?;
 
+    // if the mime-headers should be saved, find out its size
+    // (the mime-header ends with an empty line)
+    let save_mime_headers = context.get_config_bool(Config::SaveMimeHeaders).await?;
+
     let mime_in_reply_to = mime_parser
         .get_header(HeaderDef::InReplyTo)
         .unwrap_or_default();
@@ -1430,7 +1434,7 @@ async fn add_parts(
     // `true` finally.
     let mut save_mime_modified = false;
 
-    let mime_headers = if mime_parser.is_mime_modified {
+    let mime_headers = if save_mime_headers || mime_parser.is_mime_modified {
         let headers = if !mime_parser.decoded_data.is_empty() {
             mime_parser.decoded_data.clone()
         } else {
@@ -1495,9 +1499,71 @@ async fn add_parts(
         }
     }
 
-    if handle_edit_delete(context, mime_parser, from_id).await? {
+    if let Some(rfc724_mid) = mime_parser.get_header(HeaderDef::ChatEdit) {
         chat_id = DC_CHAT_ID_TRASH;
-        info!(context, "Message edits/deletes existing message (TRASH).");
+        if let Some((original_msg_id, _)) = rfc724_mid_exists(context, rfc724_mid).await? {
+            if let Some(mut original_msg) =
+                Message::load_from_db_optional(context, original_msg_id).await?
+            {
+                if original_msg.from_id == from_id {
+                    if let Some(part) = mime_parser.parts.first() {
+                        let edit_msg_showpadlock = part
+                            .param
+                            .get_bool(Param::GuaranteeE2ee)
+                            .unwrap_or_default();
+                        if edit_msg_showpadlock || !original_msg.get_showpadlock() {
+                            let new_text =
+                                part.msg.strip_prefix(EDITED_PREFIX).unwrap_or(&part.msg);
+                            chat::save_text_edit_to_db(context, &mut original_msg, new_text)
+                                .await?;
+                        } else {
+                            warn!(context, "Edit message: Not encrypted.");
+                        }
+                    }
+                } else {
+                    warn!(context, "Edit message: Bad sender.");
+                }
+            } else {
+                warn!(context, "Edit message: Database entry does not exist.");
+            }
+        } else {
+            warn!(
+                context,
+                "Edit message: rfc724_mid {rfc724_mid:?} not found."
+            );
+        }
+    } else if let Some(rfc724_mid_list) = mime_parser.get_header(HeaderDef::ChatDelete) {
+        chat_id = DC_CHAT_ID_TRASH;
+        if let Some(part) = mime_parser.parts.first() {
+            if part.param.get_bool(Param::GuaranteeE2ee).unwrap_or(false) {
+                let mut modified_chat_ids = HashSet::new();
+                let mut msg_ids = Vec::new();
+
+                let rfc724_mid_vec: Vec<&str> = rfc724_mid_list.split_whitespace().collect();
+                for rfc724_mid in rfc724_mid_vec {
+                    if let Some((msg_id, _)) =
+                        message::rfc724_mid_exists(context, rfc724_mid).await?
+                    {
+                        if let Some(msg) = Message::load_from_db_optional(context, msg_id).await? {
+                            if msg.from_id == from_id {
+                                message::delete_msg_locally(context, &msg).await?;
+                                msg_ids.push(msg.id);
+                                modified_chat_ids.insert(msg.chat_id);
+                            } else {
+                                warn!(context, "Delete message: Bad sender.");
+                            }
+                        } else {
+                            warn!(context, "Delete message: Database entry does not exist.");
+                        }
+                    } else {
+                        warn!(context, "Delete message: {rfc724_mid:?} not found.");
+                    }
+                }
+                message::delete_msgs_locally_done(context, &msg_ids, modified_chat_ids).await?;
+            } else {
+                warn!(context, "Delete message: Not encrypted.");
+            }
+        }
     }
 
     let mut parts = mime_parser.parts.iter().peekable();
@@ -1632,7 +1698,7 @@ RETURNING id
                     },
                     hidden,
                     part.bytes as isize,
-                    if save_mime_modified && !(trash || hidden) {
+                    if (save_mime_headers || save_mime_modified) && !(trash || hidden) {
                         mime_headers.clone()
                     } else {
                         Vec::new()
@@ -1766,89 +1832,6 @@ RETURNING id
     })
 }
 
-/// Checks for "Chat-Edit" and "Chat-Delete" headers,
-/// and edits/deletes existing messages accordingly.
-///
-/// Returns `true` if this message is an edit/deletion request.
-async fn handle_edit_delete(
-    context: &Context,
-    mime_parser: &MimeMessage,
-    from_id: ContactId,
-) -> Result<bool> {
-    if let Some(rfc724_mid) = mime_parser.get_header(HeaderDef::ChatEdit) {
-        if let Some((original_msg_id, _)) = rfc724_mid_exists(context, rfc724_mid).await? {
-            if let Some(mut original_msg) =
-                Message::load_from_db_optional(context, original_msg_id).await?
-            {
-                if original_msg.from_id == from_id {
-                    if let Some(part) = mime_parser.parts.first() {
-                        let edit_msg_showpadlock = part
-                            .param
-                            .get_bool(Param::GuaranteeE2ee)
-                            .unwrap_or_default();
-                        if edit_msg_showpadlock || !original_msg.get_showpadlock() {
-                            let new_text =
-                                part.msg.strip_prefix(EDITED_PREFIX).unwrap_or(&part.msg);
-                            chat::save_text_edit_to_db(context, &mut original_msg, new_text)
-                                .await?;
-                        } else {
-                            warn!(context, "Edit message: Not encrypted.");
-                        }
-                    }
-                } else {
-                    warn!(context, "Edit message: Bad sender.");
-                }
-            } else {
-                warn!(context, "Edit message: Database entry does not exist.");
-            }
-        } else {
-            warn!(
-                context,
-                "Edit message: rfc724_mid {rfc724_mid:?} not found."
-            );
-        }
-
-        Ok(true)
-    } else if let Some(rfc724_mid_list) = mime_parser.get_header(HeaderDef::ChatDelete) {
-        if let Some(part) = mime_parser.parts.first() {
-            // See `message::delete_msgs_ex()`, unlike edit requests, DC doesn't send unencrypted
-            // deletion requests, so there's no need to support them.
-            if part.param.get_bool(Param::GuaranteeE2ee).unwrap_or(false) {
-                let mut modified_chat_ids = HashSet::new();
-                let mut msg_ids = Vec::new();
-
-                let rfc724_mid_vec: Vec<&str> = rfc724_mid_list.split_whitespace().collect();
-                for rfc724_mid in rfc724_mid_vec {
-                    if let Some((msg_id, _)) =
-                        message::rfc724_mid_exists(context, rfc724_mid).await?
-                    {
-                        if let Some(msg) = Message::load_from_db_optional(context, msg_id).await? {
-                            if msg.from_id == from_id {
-                                message::delete_msg_locally(context, &msg).await?;
-                                msg_ids.push(msg.id);
-                                modified_chat_ids.insert(msg.chat_id);
-                            } else {
-                                warn!(context, "Delete message: Bad sender.");
-                            }
-                        } else {
-                            warn!(context, "Delete message: Database entry does not exist.");
-                        }
-                    } else {
-                        warn!(context, "Delete message: {rfc724_mid:?} not found.");
-                    }
-                }
-                message::delete_msgs_locally_done(context, &msg_ids, modified_chat_ids).await?;
-            } else {
-                warn!(context, "Delete message: Not encrypted.");
-            }
-        }
-
-        Ok(true)
-    } else {
-        Ok(false)
-    }
-}
-
 async fn tweak_sort_timestamp(
     context: &Context,
     mime_parser: &mut MimeMessage,

src/receive_imf/receive_imf_tests.rs

@@ -1,4 +1,3 @@
-use rand::Rng;
 use std::time::Duration;
 
 use tokio::fs;
@@ -1895,11 +1894,44 @@ async fn test_save_mime_headers_off() -> anyhow::Result<()> {
 
     let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
     assert_eq!(msg.get_text(), "hi!");
+    assert!(!msg.get_showpadlock());
     let mime = message::get_mime_headers(&bob, msg.id).await?;
     assert!(mime.is_empty());
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_save_mime_headers_on() -> anyhow::Result<()> {
+    let alice = TestContext::new_alice().await;
+    alice.set_config_bool(Config::SaveMimeHeaders, true).await?;
+    let bob = TestContext::new_bob().await;
+    bob.set_config_bool(Config::SaveMimeHeaders, true).await?;
+
+    // alice sends a message to bob, bob sees full mime
+    let chat_alice = alice.create_chat(&bob).await;
+    chat::send_text_msg(&alice, chat_alice.id, "hi!".to_string()).await?;
+
+    let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
+    assert_eq!(msg.get_text(), "hi!");
+    assert!(!msg.get_showpadlock());
+    let mime = message::get_mime_headers(&bob, msg.id).await?;
+    let mime_str = String::from_utf8_lossy(&mime);
+    assert!(mime_str.contains("Message-ID:"));
+    assert!(mime_str.contains("From:"));
+
+    // another one, from bob to alice, that gets encrypted
+    let chat_bob = bob.create_chat(&alice).await;
+    chat::send_text_msg(&bob, chat_bob.id, "ho!".to_string()).await?;
+    let msg = alice.recv_msg(&bob.pop_sent_msg().await).await;
+    assert_eq!(msg.get_text(), "ho!");
+    assert!(msg.get_showpadlock());
+    let mime = message::get_mime_headers(&alice, msg.id).await?;
+    let mime_str = String::from_utf8_lossy(&mime);
+    assert!(mime_str.contains("Message-ID:"));
+    assert!(mime_str.contains("From:"));
+    Ok(())
+}
+
 async fn check_alias_reply(from_dc: bool, chat_request: bool, group_request: bool) {
     let mut tcm = TestContextManager::new();
     let alice = tcm.alice().await;
@@ -2218,17 +2250,6 @@ async fn test_no_smtp_job_for_self_chat() -> Result<()> {
     let mut msg = Message::new_text("Happy birthday to me".to_string());
     chat::send_msg(bob, chat_id, &mut msg).await?;
     assert!(bob.pop_sent_msg_opt(Duration::ZERO).await.is_none());
-
-    bob.set_config_bool(Config::BccSelf, true).await?;
-    bob.set_config(Config::DeleteServerAfter, Some("1")).await?;
-    let mut msg = Message::new_text("Happy birthday to me".to_string());
-    chat::send_msg(bob, chat_id, &mut msg).await?;
-    assert!(bob.pop_sent_msg_opt(Duration::ZERO).await.is_none());
-
-    bob.set_config(Config::DeleteServerAfter, None).await?;
-    let mut msg = Message::new_text("Happy birthday to me".to_string());
-    chat::send_msg(bob, chat_id, &mut msg).await?;
-    assert!(bob.pop_sent_msg_opt(Duration::ZERO).await.is_some());
     Ok(())
 }
 
@@ -4653,14 +4674,7 @@ async fn test_download_later() -> Result<()> {
 
     let bob = tcm.bob().await;
     let bob_chat = bob.create_chat(&alice).await;
-
-    // Generate a random string so OpenPGP does not compress it.
-    let text: String = rand::thread_rng()
-        .sample_iter(&rand::distributions::Alphanumeric)
-        .take(MIN_DOWNLOAD_LIMIT as usize)
-        .map(char::from)
-        .collect();
-
+    let text = String::from_utf8(vec![b'a'; MIN_DOWNLOAD_LIMIT as usize])?;
     let sent_msg = bob.send_text(bob_chat.id, &text).await;
     let msg = alice.recv_msg(&sent_msg).await;
     assert_eq!(msg.download_state, DownloadState::Available);

src/securejoin/securejoin_tests.rs

@@ -141,7 +141,7 @@ async fn test_setup_contact_ex(case: SetupContactCase) {
         msg.get_header(HeaderDef::SecureJoin).unwrap(),
         "vc-auth-required"
     );
-    let bob_chat = bob.get_chat(&alice).await;
+    let bob_chat = bob.create_chat(&alice).await;
     assert_eq!(bob_chat.can_send(&bob).await.unwrap(), false);
     assert_eq!(
         bob_chat.why_cant_send(&bob).await.unwrap(),
@@ -154,7 +154,7 @@ async fn test_setup_contact_ex(case: SetupContactCase) {
 
     // Step 4: Bob receives vc-auth-required, sends vc-request-with-auth
     bob.recv_msg_trash(&sent).await;
-    let bob_chat = bob.get_chat(&alice).await;
+    let bob_chat = bob.create_chat(&alice).await;
     assert_eq!(bob_chat.can_send(&bob).await.unwrap(), true);
 
     // Check Bob emitted the JoinerProgress event.
@@ -252,7 +252,7 @@ async fn test_setup_contact_ex(case: SetupContactCase) {
     assert_eq!(contact_bob.is_bot(), false);
 
     // exactly one one-to-one chat should be visible for both now
-    // (check this before calling alice.get_chat() explicitly below)
+    // (check this before calling alice.create_chat() explicitly below)
     assert_eq!(
         Chatlist::try_load(&alice, 0, None, None)
             .await
@@ -267,7 +267,7 @@ async fn test_setup_contact_ex(case: SetupContactCase) {
 
     // Check Alice got the verified message in her 1:1 chat.
     {
-        let chat = alice.get_chat(&bob).await;
+        let chat = alice.create_chat(&bob).await;
         let msg = get_chat_msg(&alice, chat.get_id(), 0, 1).await;
         assert!(msg.is_info());
         let expected_text = chat_protection_enabled(&alice).await;
@@ -816,13 +816,8 @@ async fn test_shared_bobs_key() -> Result<()> {
     let bob3_addr = "bob3@example.net";
     bob3.configure_addr(bob3_addr).await;
     imex(bob3, ImexMode::ImportSelfKeys, export_dir.path(), None).await?;
-    let chat = bob3.create_email_chat(alice).await;
-    let sent = bob3.send_text(chat.id, "hi Alice!").await;
-    let msg = alice.recv_msg(&sent).await;
-    assert!(!msg.get_showpadlock());
-    let chat = alice.create_email_chat(bob3).await;
-    let sent = alice.send_text(chat.id, "hi Bob3!").await;
-    let msg = bob3.recv_msg(&sent).await;
+    tcm.send_recv(bob3, alice, "hi Alice!").await;
+    let msg = tcm.send_recv(alice, bob3, "hi Bob3!").await;
     assert!(msg.get_showpadlock());
 
     let mut bob_ids = HashSet::new();

src/summary.rs

@@ -97,25 +97,24 @@ impl Summary {
         let prefix = if msg.state == MessageState::OutDraft {
             Some(SummaryPrefix::Draft(stock_str::draft(context).await))
         } else if msg.from_id == ContactId::SELF {
-            if msg.is_info() {
+            if msg.is_info() || chat.is_self_talk() {
                 None
             } else {
                 Some(SummaryPrefix::Me(stock_str::self_msg(context).await))
             }
-        } else if chat.typ == Chattype::Group
-            || chat.typ == Chattype::Broadcast
-            || chat.typ == Chattype::Mailinglist
-            || chat.is_self_talk()
-        {
-            if msg.is_info() || contact.is_none() {
-                None
-            } else {
-                msg.get_override_sender_name()
-                    .or_else(|| contact.map(|contact| msg.get_sender_name(contact)))
-                    .map(SummaryPrefix::Username)
-            }
         } else {
-            None
+            match chat.typ {
+                Chattype::Group | Chattype::Broadcast | Chattype::Mailinglist => {
+                    if msg.is_info() || contact.is_none() {
+                        None
+                    } else {
+                        msg.get_override_sender_name()
+                            .or_else(|| contact.map(|contact| msg.get_sender_name(contact)))
+                            .map(SummaryPrefix::Username)
+                    }
+                }
+                Chattype::Single => None,
+            }
         };
 
         let mut text = msg.get_summary_text(context).await;

src/test_utils.rs

@@ -29,7 +29,7 @@ use crate::config::Config;
 use crate::constants::DC_CHAT_ID_TRASH;
 use crate::constants::DC_GCL_NO_SPECIALS;
 use crate::constants::{Blocked, Chattype};
-use crate::contact::{import_vcard, make_vcard, Contact, ContactId, Modifier, Origin};
+use crate::contact::{Contact, ContactId, Modifier, Origin};
 use crate::context::Context;
 use crate::e2ee::EncryptHelper;
 use crate::events::{Event, EventEmitter, EventType, Events};
@@ -167,10 +167,7 @@ impl TestContextManager {
         );
     }
 
-    /// Executes SecureJoin protocol between `scanner` and `scanned`.
-    ///
-    /// Returns chat ID of the 1:1 chat for `scanner`.
-    pub async fn execute_securejoin(&self, scanner: &TestContext, scanned: &TestContext) -> ChatId {
+    pub async fn execute_securejoin(&self, scanner: &TestContext, scanned: &TestContext) {
         self.section(&format!(
             "{} scans {}'s QR code",
             scanner.name(),
@@ -178,20 +175,12 @@ impl TestContextManager {
         ));
 
         let qr = get_securejoin_qr(&scanned.ctx, None).await.unwrap();
-        self.exec_securejoin_qr(scanner, scanned, &qr).await
+        self.exec_securejoin_qr(scanner, scanned, &qr).await;
     }
 
     /// Executes SecureJoin initiated by `scanner` scanning `qr` generated by `scanned`.
-    ///
-    /// The [`ChatId`] of the created chat is returned, for a SetupContact QR this is the 1:1
-    /// chat with `scanned`, for a SecureJoin QR this is the group chat.
-    pub async fn exec_securejoin_qr(
-        &self,
-        scanner: &TestContext,
-        scanned: &TestContext,
-        qr: &str,
-    ) -> ChatId {
-        let chat_id = join_securejoin(&scanner.ctx, qr).await.unwrap();
+    pub async fn exec_securejoin_qr(&self, scanner: &TestContext, scanned: &TestContext, qr: &str) {
+        join_securejoin(&scanner.ctx, qr).await.unwrap();
 
         loop {
             if let Some(sent) = scanner.pop_sent_msg_opt(Duration::ZERO).await {
@@ -202,7 +191,6 @@ impl TestContextManager {
                 break;
             }
         }
-        chat_id
     }
 }
 
@@ -727,26 +715,11 @@ impl TestContext {
 
     /// Creates or returns an existing 1:1 [`Chat`] with another account.
     ///
-    /// This first creates a contact by exporting a vCard from the `other`
-    /// and importing it into `self`,
-    /// then creates a 1:1 chat with this contact.
+    /// This first creates a contact using the configured details on the other account, then
+    /// creates a 1:1 chat with this contact.
     pub async fn create_chat(&self, other: &TestContext) -> Chat {
-        let vcard = make_vcard(other, &[ContactId::SELF]).await.unwrap();
-        let contact_ids = import_vcard(self, &vcard).await.unwrap();
-        assert_eq!(contact_ids.len(), 1);
-        let contact_id = contact_ids.first().unwrap();
-        let chat_id = ChatId::create_for_contact(self, *contact_id).await.unwrap();
-        Chat::load_from_db(self, chat_id).await.unwrap()
-    }
-
-    /// Creates or returns an existing 1:1 [`Chat`] with another account
-    /// by email address.
-    ///
-    /// This function can be used to create unencrypted chats.
-    pub async fn create_email_chat(&self, other: &TestContext) -> Chat {
         let contact = self.add_or_lookup_contact(other).await;
         let chat_id = ChatId::create_for_contact(self, contact.id).await.unwrap();
-
         Chat::load_from_db(self, chat_id).await.unwrap()
     }
 
@@ -770,15 +743,6 @@ impl TestContext {
         Chat::load_from_db(self, chat_id).await.unwrap()
     }
 
-    pub async fn assert_no_chat(&self, id: ChatId) {
-        assert!(Chat::load_from_db(self, id).await.is_err());
-        assert!(!self
-            .sql
-            .exists("SELECT COUNT(*) FROM chats WHERE id=?", (id,))
-            .await
-            .unwrap());
-    }
-
     /// Sends out the text message.
     ///
     /// This is not hooked up to any SMTP-IMAP pipeline, so the other account must call

src/tests/verified_chats.rs

@@ -186,14 +186,14 @@ async fn test_missing_peerstate_reexecute_securejoin() -> Result<()> {
     let alice_addr = alice.get_config(Config::Addr).await?.unwrap();
     let bob = &tcm.bob().await;
     enable_verified_oneonone_chats(&[alice, bob]).await;
-    let chat_id = tcm.execute_securejoin(bob, alice).await;
-    let chat = Chat::load_from_db(bob, chat_id).await?;
+    tcm.execute_securejoin(bob, alice).await;
+    let chat = bob.get_chat(alice).await;
     assert!(chat.is_protected());
     bob.sql
         .execute("DELETE FROM acpeerstates WHERE addr=?", (&alice_addr,))
         .await?;
-    let chat_id = tcm.execute_securejoin(bob, alice).await;
-    let chat = Chat::load_from_db(bob, chat_id).await?;
+    tcm.execute_securejoin(bob, alice).await;
+    let chat = bob.get_chat(alice).await;
     assert!(chat.is_protected());
     assert!(!chat.is_protection_broken());
     Ok(())

src/tools.rs

@@ -603,36 +603,6 @@ where
     }
 }
 
-pub(crate) trait ToOption<T> {
-    fn to_option(self) -> Option<T>;
-}
-impl<'a> ToOption<&'a str> for &'a String {
-    fn to_option(self) -> Option<&'a str> {
-        if self.is_empty() {
-            None
-        } else {
-            Some(self)
-        }
-    }
-}
-impl ToOption<String> for u16 {
-    fn to_option(self) -> Option<String> {
-        if self == 0 {
-            None
-        } else {
-            Some(self.to_string())
-        }
-    }
-}
-impl ToOption<String> for Option<i32> {
-    fn to_option(self) -> Option<String> {
-        match self {
-            None | Some(0) => None,
-            Some(v) => Some(v.to_string()),
-        }
-    }
-}
-
 pub fn remove_subject_prefix(last_subject: &str) -> String {
     let subject_start = if last_subject.starts_with("Chat:") {
         0

src/webxdc/webxdc_tests.rs

@@ -726,7 +726,7 @@ async fn test_send_webxdc_status_update() -> Result<()> {
     let bob = TestContext::new_bob().await;
 
     // Alice sends an webxdc instance and a status update
-    let alice_chat = alice.create_email_chat(&bob).await;
+    let alice_chat = alice.create_chat(&bob).await;
     let alice_instance = send_webxdc_instance(&alice, alice_chat.id).await?;
     let sent1 = &alice.pop_sent_msg().await;
     assert_eq!(alice_instance.viewtype, Viewtype::Webxdc);
@@ -1022,7 +1022,7 @@ async fn test_pop_status_update() -> Result<()> {
 async fn test_draft_and_send_webxdc_status_update() -> Result<()> {
     let alice = TestContext::new_alice().await;
     let bob = TestContext::new_bob().await;
-    let alice_chat_id = alice.create_email_chat(&bob).await.id;
+    let alice_chat_id = alice.create_chat(&bob).await.id;
 
     // prepare webxdc instance,
     // status updates are not sent for drafts, therefore send_webxdc_status_update() returns Ok(None)
@@ -1648,26 +1648,29 @@ async fn test_webxdc_no_internet_access() -> Result<()> {
     let group_id = create_group_chat(&t, ProtectionStatus::Unprotected, "chat").await?;
     let broadcast_id = create_broadcast_list(&t).await?;
 
-    for chat_id in [self_id, single_id, group_id, broadcast_id] {
-        for internet_xdc in [true, false] {
-            let mut instance = create_webxdc_instance(
-                &t,
-                "foo.xdc",
-                if internet_xdc {
-                    include_bytes!("../../test-data/webxdc/request-internet-access.xdc")
-                } else {
-                    include_bytes!("../../test-data/webxdc/minimal.xdc")
-                },
-            )?;
-            let instance_id = send_msg(&t, chat_id, &mut instance).await?;
-            t.send_webxdc_status_update(
-                instance_id,
-                r#"{"summary":"real summary", "payload": 42}"#,
-            )
-            .await?;
-            let instance = Message::load_from_db(&t, instance_id).await?;
-            let info = instance.get_webxdc_info(&t).await?;
-            assert_eq!(info.internet_access, false);
+    for e2ee in ["1", "0"] {
+        t.set_config(Config::E2eeEnabled, Some(e2ee)).await?;
+        for chat_id in [self_id, single_id, group_id, broadcast_id] {
+            for internet_xdc in [true, false] {
+                let mut instance = create_webxdc_instance(
+                    &t,
+                    "foo.xdc",
+                    if internet_xdc {
+                        include_bytes!("../../test-data/webxdc/request-internet-access.xdc")
+                    } else {
+                        include_bytes!("../../test-data/webxdc/minimal.xdc")
+                    },
+                )?;
+                let instance_id = send_msg(&t, chat_id, &mut instance).await?;
+                t.send_webxdc_status_update(
+                    instance_id,
+                    r#"{"summary":"real summary", "payload": 42}"#,
+                )
+                .await?;
+                let instance = Message::load_from_db(&t, instance_id).await?;
+                let info = instance.get_webxdc_info(&t).await?;
+                assert_eq!(info.internet_access, false);
+            }
         }
     }
 

standards.md

@@ -21,7 +21,7 @@ Detect/prevent active attacks    | [securejoin][] protocols
 Compare public keys              | [openpgp4fpr][] URI Scheme
 Header encryption                | [Header Protection for Cryptographically Protected E-mail](https://datatracker.ietf.org/doc/draft-ietf-lamps-header-protection/)
 Configuration assistance         | [Autoconfigure](https://web.archive.org/web/20210402044801/https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration) and [Autodiscover][]
-Messenger functions              | [Chat-over-Email](https://github.com/chatmail/core/blob/main/spec.md#chat-mail-specification)
+Messenger functions              | [Chat-over-Email](https://github.com/deltachat/deltachat-core-rust/blob/master/spec.md#chat-mail-specification)
 Detect mailing list              | List-Id ([RFC 2919][]) and Precedence ([RFC 3834][])
 User and chat colors             | [XEP-0392][]: Consistent Color Generation
 Send and receive system messages | Multipart/Report Media Type ([RFC 6522][])

test-data/message/mail_with_user_and_group_avatars.eml

@@ -1,5 +1,7 @@
 Chat-Group-ID: WVnDtF5azch
 Chat-Group-Name: =?utf-8?q?testgr1?=
+Chat-Group-Avatar: group-image.png
+Chat-User-Avatar: avatar.png
 Subject: =?utf-8?q?Chat=3A_testgr1=3A_hi!_?=
 Date: Thu, 12 Dec 2019 17:24:03 +0000
 X-Mailer: Delta Chat Core 1.0.0-beta.15/CLI
@@ -12,8 +14,6 @@ Content-Type: multipart/mixed; boundary="LV8nfXkpyyn39fsVyoB1b29PKDMeb5"
 
 --LV8nfXkpyyn39fsVyoB1b29PKDMeb5
 Content-Type: text/plain; charset=utf-8
-Chat-Group-Avatar: group-image.png
-Chat-User-Avatar: avatar.png
 
 hi!