feat: add scripts/zig-ffi.sh

This script can be used to compile the libraries used in the Android application without the NDK.
2026-10-09 22:50:20 +03:00 · 2023-06-26 15:36:49 +00:00
108 changed files with 3151 additions and 6928 deletions
@@ -15,7 +15,6 @@ on:
  push:
    branches:
      - master
-      - stable

 env:
  RUSTFLAGS: -Dwarnings
@@ -25,7 +24,7 @@ jobs:
    name: Lint Rust
    runs-on: ubuntu-latest
    env:
-      RUSTUP_TOOLCHAIN: 1.72.0
+      RUSTUP_TOOLCHAIN: 1.70.0
    steps:
      - uses: actions/checkout@v3
      - name: Install rustfmt and clippy
@@ -67,9 +67,7 @@ jobs:

    # Build Linux prebuilds inside a container with old glibc for backwards compatibility.
    # Debian 10 contained glibc 2.28 at the time of the writing (2023-06-04): https://packages.debian.org/buster/libc6
-    # Ubuntu 18.04 is at the End of Standard Support since June 2023, but it contains glibc 2.27,
-    # so we are using it to support Ubuntu 18.04 setups that are still not upgraded.
-    container: ubuntu:18.04
+    container: debian:10
    steps:
      # Working directory is owned by 1001:1001 by default.
      # Change it to our user.
@@ -1,185 +1,5 @@
 # Changelog

-## [1.122.0] - 2023-09-12
-
-### API-Changes
-
- jsonrpc: Return only chat IDs for similar chats.
-
-### Fixes
-
- Reopen all connections on database passpharse change.
- Do not block new group chats if 1:1 chat is blocked.
- Improve group membership consistency algorithm ([#3782](https://github.com/deltachat/deltachat-core-rust/pull/3782))([#4624](https://github.com/deltachat/deltachat-core-rust/pull/4624)).
- Forbid membership changes from possible non-members ([#3782](https://github.com/deltachat/deltachat-core-rust/pull/3782)).
- `ChatId::parent_query()`: Don't filter out OutPending and OutFailed messages.
-
-### Build system
-
- Update to OpenSSL 3.0.
- Bump webpki from 0.22.0 to 0.22.1.
- python: Add link to Mastodon into projects.urls.
-
-### Features / Changes
-
- Add RSA-4096 key generation support.
-
-### Refactor
-
- pgp: Add constants for encryption algorithm and hash.
-
-## [1.121.0] - 2023-09-06
-
-### API-Changes
-
- Add `dc_context_change_passphrase()`.
- Add `Message.set_file_from_bytes()` API.
- Add experimental API to get similar chats.
-
-### Build system
-
- Build node packages on Ubuntu 18.04 instead of Debian 10.
-  This reduces the requirement for glibc version from 2.28 to 2.27.
-
-### Fixes
-
- Allow membership changes by a MUA if we're not in the group ([#4624](https://github.com/deltachat/deltachat-core-rust/pull/4624)).
- Save mime headers for messages not signed with a known key ([#4557](https://github.com/deltachat/deltachat-core-rust/pull/4557)).
- Return from `dc_get_chatlist(DC_GCL_FOR_FORWARDING)` only chats where we can send ([#4616](https://github.com/deltachat/deltachat-core-rust/pull/4616)).
- Do not allow dots at the end of email addresses.
- deltachat-rpc-client: Remove `aiodns` optional dependency from required dependencies.
-  `aiodns` depends on `pycares` which [fails to install in Termux](https://github.com/saghul/aiodns/issues/98).
-
-## [1.120.0] - 2023-08-28
-
-### API-Changes
-
- jsonrpc: Add `resend_messages`.
-
-### Fixes
-
- Update async-imap to 0.9.1 to fix memory leak.
- Delete messages from SMTP queue only on user demand ([#4579](https://github.com/deltachat/deltachat-core-rust/pull/4579)).
- Do not send images without transparency as stickers ([#4611](https://github.com/deltachat/deltachat-core-rust/pull/4611)).
- `prepare_msg_blob()`: do not use the image if it has Exif metadata but the image cannot be recoded.
-
-### Refactor
-
- Hide accounts.rs constants from public API.
- Hide pgp module from public API.
-
-### Build system
-
- Update to Zig 0.11.0.
- Update to Rust 1.72.0.
-
-### CI
-
- Run on push to stable branch.
-
-### Miscellaneous Tasks
-
- python: Fix lint errors.
- python: Fix `ruff` 0.0.286 warnings.
- Fix beta clippy warnings.
-
-## [1.119.1] - 2023-08-06
-
-Bugfix release attempting to fix the [iOS build error](https://github.com/deltachat/deltachat-core-rust/issues/4610).
-
-### Features / Changes
-
- Guess message viewtype from "application/octet-stream" attachment extension ([#4378](https://github.com/deltachat/deltachat-core-rust/pull/4378)).
-
-### Fixes
-
- Update `xattr` from 1.0.0 to 1.0.1 to fix UnsupportedPlatformError import.
-
-### Tests
-
- webxdc: Ensure unknown WebXDC update properties do not result in an error.
-
-## [1.119.0] - 2023-08-03
-
-### Fixes
-
- imap: Avoid IMAP move loops when DeltaChat folder is aliased.
- imap: Do not resync IMAP after initial configuration.
-
- webxdc: Accept WebXDC updates in mailing lists.
- webxdc: Base64-encode WebXDC updates to prevent corruption of large unencrypted WebXDC updates.
- webxdc: Delete old webxdc status updates during housekeeping.
-
- Return valid MsgId from `receive_imf()` when the message is replaced.
- Emit MsgsChanged event with correct chat id for replaced messages.
-
- deltachat-rpc-server: Update tokio-tar to fix backup import.
-
-### Features / Changes
-
- deltachat-rpc-client: Add `MSG_DELETED` constant.
- Make `dc_msg_get_filename()` return the original attachment filename ([#4309](https://github.com/deltachat/deltachat-core-rust/pull/4309)).
-
-### API-Changes
-
- deltachat-rpc-client: Add `Account.{import,export}_backup` methods.
- deltachat-jsonrpc: Make `MessageObject.text` non-optional.
-
-### Documentation
-
- Update default value for `show_emails` in `dc_set_config()` documentation.
-
-### Refactor
-
- Improve IMAP logs.
-
-### Tests
-
- Add basic import/export test for async python.
- Add `test_webxdc_download_on_demand`.
- Add tests for deletion of webxdc status-updates.
-
-## [1.118.0] - 2023-07-07
-
-### API-Changes
-
- [**breaking**] Remove `Contact::load_from_db()` in favor of `Contact::get_by_id()`.
- Add `Contact::get_by_id_optional()` API.
- [**breaking**] Make `Message.text` non-optional.
- [**breaking**] Replace `message::get_msg_info()` with `MsgId.get_info()`.
- Move `handle_mdn` and `handle_ndn` to mimeparser and make them private.
-  Previously `handle_mdn` was erroneously exposed in the public API.
- python: flatten the API of `deltachat` module.
-
-### Fixes
-
- Use different member added/removal messages locally and on the network.
- Update tokio to 1.29.1 to fix core panic after sending 29 offline messages ([#4414](https://github.com/deltachat/deltachat-core-rust/issues/4414)).
- Make SVG avatar image work on more platforms (use `xlink:href`).
- Preserve indentation when converting plaintext to HTML.
- Do not run simplify() on dehtml() output.
- Rewrite member added/removed messages even if the change is not allowed PR ([#4529](https://github.com/deltachat/deltachat-core-rust/pull/4529)).
-
-### Documentation
-
- Document how to regenerate Node.js constants before the release.
-
-### Build system
-
- git-cliff: Do not fail if commit.footers is undefined.
-
-### Other
-
- Dependency updates.
- Update MPL 2.0 license text.
- Add LICENSE file to deltachat-rpc-client.
- deltachat-rpc-client: Add Trove classifiers.
- python: Change bindings status to production/stable.
-
-### Tests
-
- Add `make-python-testenv.sh` script.
-
 ## [1.117.0] - 2023-06-15

 ### Features
@@ -2810,9 +2630,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.115.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.114.0...v1.115.0
 [1.116.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.115.0...v1.116.0
 [1.117.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.116.0...v1.117.0
-[1.118.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.117.0...v1.118.0
-[1.119.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.118.0...v1.119.0
-[1.119.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.119.0...v1.119.1
-[1.120.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.119.1...v1.120.0
-[1.121.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.120.0...v1.121.0
-[1.122.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.121.0...v1.122.0
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.122.0"
+version = "1.117.0"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.65"
@@ -36,7 +36,7 @@ ratelimit = { path = "./deltachat-ratelimit" }

 anyhow = "1"
 async-channel = "1.8.0"
-async-imap = { version = "0.9.1", default-features = false, features = ["runtime-tokio"] }
+async-imap = { version = "0.9.0", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
@@ -59,8 +59,8 @@ lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master"
 libc = "0.2"
 mailparse = "0.14"
 mime = "0.3.17"
-num_cpus = "1.16"
-num-derive = "0.4"
+num_cpus = "1.15"
+num-derive = "0.3"
 num-traits = "0.2"
 once_cell = "1.18.0"
 percent-encoding = "2.3"
@@ -68,7 +68,7 @@ parking_lot = "0.12"
 pgp = { version = "0.10", default-features = false }
 pretty_env_logger = { version = "0.5", optional = true }
 qrcodegen = "1.7.0"
-quick-xml = "0.29"
+quick-xml = "0.28"
 rand = "0.8"
 regex = "1.8"
 reqwest = { version = "0.11.18", features = ["json"] }
@@ -80,8 +80,8 @@ serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
 smallvec = "1"
-strum = "0.25"
-strum_macros = "0.25"
+strum = "0.24"
+strum_macros = "0.24"
 tagger = "4.3.4"
 textwrap = "0.16.0"
 thiserror = "1"
@@ -103,7 +103,7 @@ log = "0.4"
 pretty_env_logger = "0.5"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = "3"
-testdir = "0.8.0"
+testdir = "0.7.3"
 tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 pretty_assertions = "1.3.0"

@@ -361,7 +361,7 @@ Exhibit A - Source Code Form License Notice

  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.

 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE
@@ -67,11 +67,9 @@ body = """
        - {% if commit.breaking %}[**breaking**] {% endif %}\
 	{% if commit.scope %}{{ commit.scope }}: {% endif %}\
 	{{ commit.message | upper_first }}.\
-	{% if commit.footers is defined %}\
-	  {% for footer in commit.footers %}{% if 'BREAKING CHANGE' in footer.token %}
-	    {% raw %}  {% endraw %}- {{ footer.value }}\
-	  {% endif %}{% endfor %}\
-	{% endif%}\
+	{% for footer in commit.footers %}{% if 'BREAKING CHANGE' in footer.token %}
+	  {% raw %}  {% endraw %}- {{ footer.value }}\
+	{% endif %}{% endfor %}\
    {% endfor %}
 {% endfor %}\n
 """
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.122.0"
+version = "1.117.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -301,19 +301,6 @@ dc_context_t*   dc_context_new_closed        (const char* dbfile);
 int             dc_context_open              (dc_context_t *context, const char* passphrase);


-/**
- * Changes the passphrase on the open database.
- * Existing database must already be encrypted and the passphrase cannot be NULL or empty.
- * It is impossible to encrypt unencrypted database with this method and vice versa.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param passphrase The new passphrase.
- * @return 1 on success, 0 on error.
- */
-int             dc_context_change_passphrase (dc_context_t* context, const char* passphrase);
-
-
 /**
 * Returns 1 if database is open.
 *
@@ -433,19 +420,17 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    0=watch all folders normally (default)
 *                    changes require restarting IO by calling dc_stop_io() and then dc_start_io().
 * - `show_emails`  = DC_SHOW_EMAILS_OFF (0)=
- *                    show direct replies to chats only,
+ *                    show direct replies to chats only (default),
 *                    DC_SHOW_EMAILS_ACCEPTED_CONTACTS (1)=
 *                    also show all mails of confirmed contacts,
 *                    DC_SHOW_EMAILS_ALL (2)=
- *                    also show mails of unconfirmed contacts (default).
+ *                    also show mails of unconfirmed contacts.
 * - `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
+ *                    generate Ed25519 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)
@@ -1175,24 +1160,6 @@ int dc_send_webxdc_status_update (dc_context_t* context, uint32_t msg_id, const
 */
 char* dc_get_webxdc_status_updates (dc_context_t* context, uint32_t msg_id, uint32_t serial);

-
-/**
- * Replaces webxdc app with a new version.
- *
- * On the JavaScript side this API could be used like this:
- * ```
- * window.webxdc.replaceWebxdc(blob);
- * ```
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_id The ID of the WebXDC message to be replaced.
- * @param blob New blob to replace WebXDC with.
- * @param n Blob size.
- */
-void dc_replace_webxdc(dc_context_t* context, uint32_t msg_id, uint8_t *blob, size_t n);
-
-
 /**
 * Save a draft for a chat in the database.
 *
@@ -1354,20 +1321,6 @@ int             dc_get_msg_cnt               (dc_context_t* context, uint32_t ch
 int             dc_get_fresh_msg_cnt         (dc_context_t* context, uint32_t chat_id);


-/**
- * Returns a list of similar chats.
- *
- * @warning This is an experimental API which may change or be removed in the future.
- *
- * @memberof dc_context_t
- * @param context The context object as returned from dc_context_new().
- * @param chat_id The ID of the chat for which to find similar chats.
- * @return The list of similar chats.
- *     On errors, NULL is returned.
- *     Must be freed using dc_chatlist_unref() when no longer used.
- */
-dc_chatlist_t*     dc_get_similar_chatlist   (dc_context_t* context, uint32_t chat_id);
-

 /**
 * Estimate the number of messages that will be deleted
@@ -2302,7 +2255,6 @@ dc_contact_t*   dc_get_contact               (dc_context_t* context, uint32_t co
 *
 * - **DC_IMEX_IMPORT_SELF_KEYS** (2) - Import private keys found in the directory given as `param1`.
 *   The last imported key is made the default keys unless its name contains the string `legacy`. Public keys are not imported.
- *   If `param1` is a filename, import the private key from the file and make it the default.
 *
 * While dc_imex() returns immediately, the started job may take a while,
 * you can stop it using dc_stop_ongoing_process(). During execution of the job,
@@ -4026,17 +3978,16 @@ char*           dc_msg_get_text               (const dc_msg_t* msg);
 */
 char*           dc_msg_get_subject            (const dc_msg_t* msg);

-
 /**
- * Find out full path of the file associated with a message.
+ * Find out full path, file name and extension of the file associated with a
+ * message.
 *
 * Typically files are associated with images, videos, audios, documents.
 * Plain text messages do not have a file.
- * File name may be mangled. To obtain the original attachment filename use dc_msg_get_filename().
 *
 * @memberof dc_msg_t
 * @param msg The message object.
- * @return The full path (with file name and extension) of the file associated with the message.
+ * @return The full path, the file name, and the extension of the file associated with the message.
 *     If there is no file associated with the message, an empty string is returned.
 *     NULL is never returned and the returned value must be released using dc_str_unref().
 */
@@ -4044,13 +3995,14 @@ char*           dc_msg_get_file               (const dc_msg_t* msg);


 /**
- * Get an original attachment filename, with extension but without the path. To get the full path,
- * use dc_msg_get_file().
+ * Get a base file name without the path. The base file name includes the extension; the path
+ * is not returned. To get the full path, use dc_msg_get_file().
 *
 * @memberof dc_msg_t
 * @param msg The message object.
- * @return The attachment filename. If there is no file associated with the message, an empty string
- *     is returned. The returned value must be released using dc_str_unref().
+ * @return The base file name plus the extension without part. If there is no file
+ *     associated with the message, an empty string is returned. The returned
+ *     value must be released using dc_str_unref().
 */
 char*           dc_msg_get_filename           (const dc_msg_t* msg);

@@ -6314,7 +6266,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_KEY_GEN_DEFAULT 0
 #define DC_KEY_GEN_RSA2048 1
 #define DC_KEY_GEN_ED25519 2
-#define DC_KEY_GEN_RSA4096 3


 /**
@@ -36,7 +36,7 @@ use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
 use deltachat::stock_str::StockStrings;
-use deltachat::webxdc::{replace_webxdc, StatusUpdateSerial};
+use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
 use num_traits::{FromPrimitive, ToPrimitive};
@@ -167,24 +167,6 @@ pub unsafe extern "C" fn dc_context_open(
        .unwrap_or(0)
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_context_change_passphrase(
-    context: *mut dc_context_t,
-    passphrase: *const libc::c_char,
-) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_context_change_passphrase()");
-        return 0;
-    }
-
-    let ctx = &*context;
-    let passphrase = to_string_lossy(passphrase);
-    block_on(ctx.change_passphrase(passphrase))
-        .context("dc_context_change_passphrase() failed")
-        .log_err(ctx)
-        .is_ok() as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_context_is_open(context: *mut dc_context_t) -> libc::c_int {
    if context.is_null() {
@@ -1097,32 +1079,6 @@ pub unsafe extern "C" fn dc_get_webxdc_status_updates(
    .strdup()
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_replace_webxdc(
-    context: *mut dc_context_t,
-    msg_id: u32,
-    blob: *const u8,
-    n: libc::size_t,
-) {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_replace_webxdc()");
-        return;
-    }
-
-    let msg_id = MsgId::new(msg_id);
-    let blob_slice = std::slice::from_raw_parts(blob, n);
-
-    let ctx = &*context;
-
-    block_on(async move {
-        replace_webxdc(ctx, msg_id, blob_slice)
-            .await
-            .context("Failed to replace WebXDC")
-            .log_err(ctx)
-            .ok();
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_set_draft(
    context: *mut dc_context_t,
@@ -1286,30 +1242,6 @@ pub unsafe extern "C" fn dc_get_fresh_msg_cnt(
    })
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_get_similar_chatlist(
-    context: *mut dc_context_t,
-    chat_id: u32,
-) -> *mut dc_chatlist_t {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_similar_chatlist()");
-        return ptr::null_mut();
-    }
-    let ctx = &*context;
-
-    let chat_id = ChatId::new(chat_id);
-    match block_on(chat_id.get_similar_chatlist(ctx))
-        .context("failed to get similar chatlist")
-        .log_err(ctx)
-    {
-        Ok(list) => {
-            let ffi_list = ChatlistWrapper { context, list };
-            Box::into_raw(Box::new(ffi_list))
-        }
-        Err(_) => ptr::null_mut(),
-    }
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_estimate_deletion_cnt(
    context: *mut dc_context_t,
@@ -1565,10 +1497,14 @@ pub unsafe extern "C" fn dc_delete_chat(context: *mut dc_context_t, chat_id: u32
    }
    let ctx = &*context;

-    block_on(ChatId::new(chat_id).delete(ctx))
-        .context("Failed chat delete")
-        .log_err(ctx)
-        .ok();
+    block_on(async move {
+        ChatId::new(chat_id)
+            .delete(ctx)
+            .await
+            .context("Failed chat delete")
+            .log_err(ctx)
+            .ok();
+    })
 }

 #[no_mangle]
@@ -1941,10 +1877,13 @@ pub unsafe extern "C" fn dc_get_msg_info(
        return "".strdup();
    }
    let ctx = &*context;
-    let msg_id = MsgId::new(msg_id);
-    block_on(msg_id.get_info(ctx))
-        .unwrap_or_log_default(ctx, "failed to get msg id")
-        .strdup()
+
+    block_on(async move {
+        message::get_msg_info(ctx, MsgId::new(msg_id))
+            .await
+            .unwrap_or_log_default(ctx, "failed to get msg id")
+            .strdup()
+    })
 }

 #[no_mangle]
@@ -3369,7 +3308,7 @@ pub unsafe extern "C" fn dc_msg_get_text(msg: *mut dc_msg_t) -> *mut libc::c_cha
        return "".strdup();
    }
    let ffi_msg = &*msg;
-    ffi_msg.message.get_text().strdup()
+    ffi_msg.message.get_text().unwrap_or_default().strdup()
 }

 #[no_mangle]
@@ -3754,7 +3693,7 @@ pub unsafe extern "C" fn dc_msg_set_text(msg: *mut dc_msg_t, text: *const libc::
        return;
    }
    let ffi_msg = &mut *msg;
-    ffi_msg.message.set_text(to_string_lossy(text))
+    ffi_msg.message.set_text(to_opt_string_lossy(text))
 }

 #[no_mangle]
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.122.0"
+version = "1.117.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -17,14 +17,14 @@ deltachat = { path = ".." }
 num-traits = "0.2"
 schemars = "0.8.11"
 serde = { version = "1.0", features = ["derive"] }
-tempfile = "3.6.0"
+tempfile = "3.3.0"
 log = "0.4"
 async-channel = { version = "1.8.0" }
 futures = { version = "0.3.28" }
-serde_json = "1.0.99"
+serde_json = "1.0.96"
 yerpc = { version = "0.5.1", features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.5", features = ["json_value"] }
-tokio = { version = "1.29.1" }
+tokio = { version = "1.28.2" }
 sanitize-filename = "0.4"
 walkdir = "2.3.3"
 base64 = "0.21"
@@ -34,7 +34,7 @@ axum = { version = "0.6.18", optional = true, features = ["ws"] }
 env_logger = { version = "0.10.0", optional = true }

 [dev-dependencies]
-tokio = { version = "1.29.1", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.28.2", features = ["full", "rt-multi-thread"] }


 [features]
@@ -19,7 +19,9 @@ use deltachat::{
    context::get_info,
    ephemeral::Timer,
    imex, location,
-    message::{self, delete_msgs, markseen_msgs, Message, MessageState, MsgId, Viewtype},
+    message::{
+        self, delete_msgs, get_msg_info, markseen_msgs, Message, MessageState, MsgId, Viewtype,
+    },
    provider::get_provider_info,
    qr,
    qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg},
@@ -566,21 +568,6 @@ impl CommandApi {
        Ok(l)
    }

-    /// Returns chats similar to the given one.
-    ///
-    /// Experimental API, subject to change without notice.
-    async fn get_similar_chat_ids(&self, account_id: u32, chat_id: u32) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let chat_id = ChatId::new(chat_id);
-        let list = chat_id
-            .get_similar_chat_ids(&ctx)
-            .await?
-            .into_iter()
-            .map(|(chat_id, _metric)| chat_id.to_u32())
-            .collect();
-        Ok(list)
-    }
-
    async fn get_chatlist_items_by_entries(
        &self,
        account_id: u32,
@@ -914,7 +901,7 @@ impl CommandApi {
    ) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(text);
+        msg.set_text(Some(text));
        let message_id =
            deltachat::chat::add_device_msg(&ctx, Some(&label), Some(&mut msg)).await?;
        Ok(message_id.to_u32())
@@ -1132,7 +1119,7 @@ impl CommandApi {
    /// max. text returned by dc_msg_get_text() (about 30000 characters).
    async fn get_message_info(&self, account_id: u32, message_id: u32) -> Result<String> {
        let ctx = self.get_context(account_id).await?;
-        MsgId::new(message_id).get_info(&ctx).await
+        get_msg_info(&ctx, MsgId::new(message_id)).await
    }

    /// Returns contacts that sent read receipts and the time of reading.
@@ -1353,7 +1340,7 @@ impl CommandApi {
    ) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        let contact_id = ContactId::new(contact_id);
-        let contact = Contact::get_by_id(&ctx, contact_id).await?;
+        let contact = Contact::load_from_db(&ctx, contact_id).await?;
        let addr = contact.get_addr();
        Contact::create(&ctx, &name, addr).await?;
        Ok(())
@@ -1724,20 +1711,6 @@ impl CommandApi {
        forward_msgs(&ctx, &message_ids, ChatId::new(chat_id)).await
    }

-    /// Resend messages and make information available for newly added chat members.
-    /// Resending sends out the original message, however, recipients and webxdc-status may differ.
-    /// Clients that already have the original message can still ignore the resent message as
-    /// they have tracked the state by dedicated updates.
-    ///
-    /// Some messages cannot be resent, eg. info-messages, drafts, already pending messages or messages that are not sent by SELF.
-    ///
-    /// message_ids all message IDs that should be resend. All messages must belong to the same chat.
-    async fn resend_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let message_ids: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        chat::resend_msgs(&ctx, &message_ids).await
-    }
-
    async fn send_sticker(
        &self,
        account_id: u32,
@@ -1794,7 +1767,9 @@ impl CommandApi {
        } else {
            Viewtype::Text
        });
-        message.set_text(data.text.unwrap_or_default());
+        if data.text.is_some() {
+            message.set_text(data.text);
+        }
        if data.html.is_some() {
            message.set_html(data.html);
        }
@@ -1975,7 +1950,7 @@ impl CommandApi {
        let ctx = self.get_context(account_id).await?;

        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(text);
+        msg.set_text(Some(text));

        let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
        Ok(message_id.to_u32())
@@ -1998,7 +1973,9 @@ impl CommandApi {
        } else {
            Viewtype::Text
        });
-        message.set_text(text.unwrap_or_default());
+        if text.is_some() {
+            message.set_text(text);
+        }
        if let Some(file) = file {
            message.set_file(file, None);
        }
@@ -2042,7 +2019,9 @@ impl CommandApi {
        } else {
            Viewtype::Text
        });
-        draft.set_text(text.unwrap_or_default());
+        if text.is_some() {
+            draft.set_text(text);
+        }
        if let Some(file) = file {
            draft.set_file(file, None);
        }
@@ -53,7 +53,7 @@ impl FullChat {
            contacts.push(
                ContactObject::try_from_dc_contact(
                    context,
-                    Contact::get_by_id(context, *contact_id)
+                    Contact::load_from_db(context, *contact_id)
                        .await
                        .context("failed to load contact")?,
                )
@@ -74,7 +74,7 @@ impl FullChat {

        let was_seen_recently = if chat.get_type() == Chattype::Single {
            match contact_ids.get(0) {
-                Some(contact) => Contact::get_by_id(context, *contact)
+                Some(contact) => Contact::load_from_db(context, *contact)
                    .await
                    .context("failed to load contact for was_seen_recently")?
                    .was_seen_recently(),
@@ -8,12 +8,15 @@ use deltachat::{
    chatlist::Chatlist,
 };
 use num_traits::cast::ToPrimitive;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use typescript_type_def::TypeDef;

 use super::color_int_to_hex_string;
 use super::message::MessageViewtype;

+#[derive(Deserialize, Serialize, TypeDef, schemars::JsonSchema)]
+pub struct ChatListEntry(pub u32, pub u32);
+
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(tag = "type")]
 pub enum ChatListItemFetchResult {
@@ -104,7 +107,7 @@ pub(crate) async fn get_chat_list_item_by_id(
    let (dm_chat_contact, was_seen_recently) = if chat.get_type() == Chattype::Single {
        let contact = chat_contacts.get(0);
        let was_seen_recently = match contact {
-            Some(contact) => Contact::get_by_id(ctx, *contact)
+            Some(contact) => Contact::load_from_db(ctx, *contact)
                .await
                .context("contact")?
                .was_seen_recently(),
@@ -34,7 +34,7 @@ pub struct MessageObject {
    quote: Option<MessageQuote>,
    parent_id: Option<u32>,

-    text: String,
+    text: Option<String>,
    has_location: bool,
    has_html: bool,
    view_type: MessageViewtype,
@@ -113,7 +113,7 @@ impl MessageObject {
    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
        let message = Message::load_from_db(context, msg_id).await?;

-        let sender_contact = Contact::get_by_id(context, message.get_from_id())
+        let sender_contact = Contact::load_from_db(context, message.get_from_id())
            .await
            .context("failed to load sender contact")?;
        let sender = ContactObject::try_from_dc_contact(context, sender_contact)
@@ -135,7 +135,7 @@ impl MessageObject {
        let quote = if let Some(quoted_text) = message.quoted_text() {
            match message.quoted_message(context).await? {
                Some(quote) => {
-                    let quote_author = Contact::get_by_id(context, quote.get_from_id())
+                    let quote_author = Contact::load_from_db(context, quote.get_from_id())
                        .await
                        .context("failed to load quote author contact")?;
                    Some(MessageQuote::WithMessage {
@@ -318,7 +318,6 @@ pub enum DownloadState {
    Done,
    Available,
    Failure,
-    Undecipherable,
    InProgress,
 }

@@ -328,7 +327,6 @@ impl From<download::DownloadState> for DownloadState {
            download::DownloadState::Done => DownloadState::Done,
            download::DownloadState::Available => DownloadState::Available,
            download::DownloadState::Failure => DownloadState::Failure,
-            download::DownloadState::Undecipherable => DownloadState::Undecipherable,
            download::DownloadState::InProgress => DownloadState::InProgress,
        }
    }
@@ -471,7 +469,7 @@ impl MessageSearchResult {
    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
        let message = Message::load_from_db(context, msg_id).await?;
        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-        let sender = Contact::get_by_id(context, message.get_from_id()).await?;
+        let sender = Contact::load_from_db(context, message.get_from_id()).await?;

        let profile_image = match sender.get_profile_image(context).await? {
            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
@@ -502,7 +500,7 @@ impl MessageSearchResult {
            is_chat_protected: chat.is_protected(),
            is_chat_contact_request: chat.is_contact_request(),
            is_chat_archived: chat.get_visibility() == ChatVisibility::Archived,
-            message: message.get_text(),
+            message: message.get_text().unwrap_or_default(),
            timestamp: message.get_timestamp(),
        })
    }
@@ -55,5 +55,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.122.0"
+  "version": "1.117.0"
 }
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.122.0"
+version = "1.117.0"
 license = "MPL-2.0"
 edition = "2021"

@@ -9,10 +9,10 @@ ansi_term = "0.12.1"
 anyhow = "1"
 deltachat = { path = "..", features = ["internals"]}
 dirs = "5"
-log = "0.4.19"
+log = "0.4.18"
 pretty_env_logger = "0.5"
 rusqlite = "0.29"
-rustyline = "12"
+rustyline = "11"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }

 [features]
@@ -187,7 +187,6 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
        DownloadState::Available => " [⬇ Download available]",
        DownloadState::InProgress => " [⬇ Download in progress...]️",
        DownloadState::Failure => " [⬇ Download failed]",
-        DownloadState::Undecipherable => " [⬇ Decryption failed]",
    };

    let temp2 = timestamp_to_str(msg.get_timestamp());
@@ -200,7 +199,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
        if msg.has_location() { "📍" } else { "" },
        &contact_name,
        contact_id,
-        msgtext,
+        msgtext.unwrap_or_default(),
        if msg.has_html() { "[HAS-HTML]️" } else { "" },
        if msg.get_from_id() == ContactId::SELF {
            ""
@@ -806,30 +805,15 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        }
        "chatinfo" => {
            ensure!(sel_chat.is_some(), "No chat selected.");
-            let sel_chat_id = sel_chat.as_ref().unwrap().get_id();

-            let contacts = chat::get_chat_contacts(&context, sel_chat_id).await?;
+            let contacts =
+                chat::get_chat_contacts(&context, sel_chat.as_ref().unwrap().get_id()).await?;
            println!("Memberlist:");

            log_contactlist(&context, &contacts).await?;
-            println!("{} contacts", contacts.len());
-
-            let similar_chats = sel_chat_id.get_similar_chat_ids(&context).await?;
-            if !similar_chats.is_empty() {
-                println!("Similar chats: ");
-                for (similar_chat_id, metric) in similar_chats {
-                    let similar_chat = Chat::load_from_db(&context, similar_chat_id).await?;
-                    println!(
-                        "{} (#{}) {:.1}",
-                        similar_chat.name,
-                        similar_chat_id,
-                        100.0 * metric
-                    );
-                }
-            }
-
            println!(
-                "Location streaming: {}",
+                "{} contacts\nLocation streaming: {}",
+                contacts.len(),
                location::is_sending_locations_to_chat(
                    &context,
                    Some(sel_chat.as_ref().unwrap().get_id())
@@ -928,7 +912,9 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                Viewtype::File
            });
            msg.set_file(arg1, None);
-            msg.set_text(arg2.to_string());
+            if !arg2.is_empty() {
+                msg.set_text(Some(arg2.to_string()));
+            }
            chat::send_msg(&context, sel_chat.as_ref().unwrap().get_id(), &mut msg).await?;
        }
        "sendhtml" => {
@@ -940,11 +926,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu

            let mut msg = Message::new(Viewtype::Text);
            msg.set_html(Some(html.to_string()));
-            msg.set_text(if arg2.is_empty() {
+            msg.set_text(Some(if arg2.is_empty() {
                path.file_name().unwrap().to_string_lossy().to_string()
            } else {
                arg2.to_string()
-            });
+            }));
            chat::send_msg(&context, sel_chat.as_ref().unwrap().get_id(), &mut msg).await?;
        }
        "sendsyncmsg" => match context.send_sync_msg().await? {
@@ -993,7 +979,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu

            if !arg1.is_empty() {
                let mut draft = Message::new(Viewtype::Text);
-                draft.set_text(arg1.to_string());
+                draft.set_text(Some(arg1.to_string()));
                sel_chat
                    .as_ref()
                    .unwrap()
@@ -1017,7 +1003,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                "Please specify text to add as device message."
            );
            let mut msg = Message::new(Viewtype::Text);
-            msg.set_text(arg1.to_string());
+            msg.set_text(Some(arg1.to_string()));
            chat::add_device_msg(&context, None, Some(&mut msg)).await?;
        }
        "listmedia" => {
@@ -1104,7 +1090,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        "msginfo" => {
            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
            let id = MsgId::new(arg1.parse()?);
-            let res = id.get_info(&context).await?;
+            let res = message::get_msg_info(&context, id).await?;
            println!("{res}");
        }
        "download" => {
@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
--------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
--------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
-------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
---------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
--------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
-------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
---------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
---------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
@@ -6,22 +6,8 @@ build-backend = "setuptools.build_meta"
 name = "deltachat-rpc-client"
 description = "Python client for Delta Chat core JSON-RPC interface"
 dependencies = [
-    "aiohttp"
-]
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Framework :: AsyncIO",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-    "Operating System :: POSIX :: Linux",
-    "Operating System :: MacOS :: MacOS X",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Topic :: Communications :: Chat",
-    "Topic :: Communications :: Email"
+    "aiohttp",
+    "aiodns"
 ]
 dynamic = [
    "version"
@@ -259,11 +259,3 @@ class Account:
        )
        fresh_msg_ids = sorted(await self._rpc.get_fresh_msgs(self.id))
        return [Message(self, msg_id) for msg_id in fresh_msg_ids]
-
-    async def export_backup(self, path, passphrase: str = "") -> None:
-        """Export backup."""
-        await self._rpc.export_backup(self.id, str(path), passphrase)
-
-    async def import_backup(self, path, passphrase: str = "") -> None:
-        """Import backup."""
-        await self._rpc.import_backup(self.id, str(path), passphrase)
@@ -45,7 +45,6 @@ class EventType(str, Enum):
    MSG_DELIVERED = "MsgDelivered"
    MSG_FAILED = "MsgFailed"
    MSG_READ = "MsgRead"
-    MSG_DELETED = "MsgDeleted"
    CHAT_MODIFIED = "ChatModified"
    CHAT_EPHEMERAL_TIMER_MODIFIED = "ChatEphemeralTimerModified"
    CONTACTS_CHANGED = "ContactsChanged"
@@ -89,14 +89,16 @@ class Rpc:
        return await queue.get()

    def __getattr__(self, attr: str):
-        async def method(*args) -> Any:
+        async def method(*args, **kwargs) -> Any:
            self.id += 1
            request_id = self.id

+            assert not (args and kwargs), "Mixing positional and keyword arguments"
+
            request = {
                "jsonrpc": "2.0",
                "method": attr,
-                "params": args,
+                "params": kwargs or args,
                "id": self.id,
            }
            data = (json.dumps(request) + "\n").encode()
@@ -101,16 +101,6 @@ async def test_account(acfactory) -> None:
    assert await alice.get_fresh_messages()
    assert await alice.get_next_messages()

-    # Test sending empty message.
-    assert len(await bob.wait_next_messages()) == 0
-    await alice_chat_bob.send_text("")
-    messages = await bob.wait_next_messages()
-    assert len(messages) == 1
-    message = messages[0]
-    snapshot = await message.get_snapshot()
-    assert snapshot.text == ""
-    await bob.mark_seen_messages([message])
-
    group = await alice.create_group("test group")
    await group.add_contact(alice_contact_bob)
    group_msg = await group.send_message(text="hello")
@@ -345,13 +335,3 @@ async def test_wait_next_messages(acfactory) -> None:
    assert len(next_messages) == 1
    snapshot = await next_messages[0].get_snapshot()
    assert snapshot.text == "Hello!"
-
-
-@pytest.mark.asyncio()
-async def test_import_export(acfactory, tmp_path) -> None:
-    alice = await acfactory.new_configured_account()
-    await alice.export_backup(tmp_path)
-
-    files = list(tmp_path.glob("*.tar"))
-    alice2 = await acfactory.get_unconfigured_account()
-    await alice2.import_backup(files[0])
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.122.0"
+version = "1.117.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -17,9 +17,9 @@ anyhow = "1"
 env_logger = { version = "0.10.0" }
 futures-lite = "1.13.0"
 log = "0.4"
-serde_json = "1.0.99"
+serde_json = "1.0.96"
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.29.1", features = ["io-std"] }
+tokio = { version = "1.28.2", features = ["io-std"] }
 tokio-util = "0.7.8"
 yerpc = { version = "0.5.1", features = ["anyhow_expose"] }

@@ -2,7 +2,6 @@
 unmaintained = "allow"
 ignore = [
    "RUSTSEC-2020-0071",
-    "RUSTSEC-2022-0093",
 ]

 [bans]
@@ -11,7 +10,6 @@ ignore = [
 # when upgrading.
 # Please keep this list alphabetically sorted.
 skip = [
-     { name = "ahash", version = "0.7.6" },
     { name = "base16ct", version = "0.1.1" },
     { name = "base64", version = "<0.21" },
     { name = "bitflags", version = "1.3.2" },
@@ -26,11 +24,9 @@ skip = [
     { name = "ed25519-dalek", version = "1.0.1" },
     { name = "ed25519", version = "1.5.3" },
     { name = "getrandom", version = "<0.2" },
-     { name = "hashbrown", version = "<0.14.0" },
+     { name = "hermit-abi", version = "<0.3" },
     { name = "idna", version = "<0.3" },
-     { name = "indexmap", version = "<2.0.0" },
-     { name = "linux-raw-sys", version = "0.3.8" },
-     { name = "num-derive", version = "0.3.3" },
+     { name = "libm", version = "0.1.4" },
     { name = "pem-rfc7468", version = "0.6.0" },
     { name = "pkcs8", version = "0.9.0" },
     { name = "quick-error", version = "<2.0" },
@@ -39,11 +35,9 @@ skip = [
     { name = "rand", version = "<0.8" },
     { name = "redox_syscall", version = "0.2.16" },
     { name = "regex-syntax", version = "0.6.29" },
-     { name = "rustix", version = "0.37.21" },
     { name = "sec1", version = "0.3.0" },
     { name = "sha2", version = "<0.10" },
     { name = "signature", version = "1.6.4" },
-     { name = "socket2", version = "0.4.9" },
     { name = "spin", version = "<0.9.6" },
     { name = "spki", version = "0.6.0" },
     { name = "syn", version = "1.0.109" },
@@ -56,10 +50,8 @@ skip = [
     { name = "windows-sys", version = "<0.48" },
     { name = "windows-targets", version = "<0.48" },
     { name = "windows_x86_64_gnullvm", version = "<0.48" },
-     { name = "windows", version = "0.32.0" },
     { name = "windows_x86_64_gnu", version = "<0.48" },
     { name = "windows_x86_64_msvc", version = "<0.48" },
-     { name = "winreg", version = "0.10.1" },
 ]


@@ -90,7 +90,6 @@ module.exports = {
  DC_KEY_GEN_DEFAULT: 0,
  DC_KEY_GEN_ED25519: 2,
  DC_KEY_GEN_RSA2048: 1,
-  DC_KEY_GEN_RSA4096: 3,
  DC_LP_AUTH_NORMAL: 4,
  DC_LP_AUTH_OAUTH2: 2,
  DC_MEDIA_QUALITY_BALANCED: 0,
@@ -90,7 +90,6 @@ export enum C {
  DC_KEY_GEN_DEFAULT = 0,
  DC_KEY_GEN_ED25519 = 2,
  DC_KEY_GEN_RSA2048 = 1,
-  DC_KEY_GEN_RSA4096 = 3,
  DC_LP_AUTH_NORMAL = 4,
  DC_LP_AUTH_OAUTH2 = 2,
  DC_MEDIA_QUALITY_BALANCED = 0,
@@ -446,8 +446,7 @@ describe('Offline Tests with unconfigured account', function () {
    context.setChatProfileImage(chatId, imagePath)
    const blobPath = context.getChat(chatId).getProfileImage()
    expect(blobPath.startsWith(blobs)).to.be.true
-    expect(blobPath.includes('image')).to.be.true
-    expect(blobPath.endsWith('.jpeg')).to.be.true
+    expect(blobPath.endsWith(image)).to.be.true

    context.setChatProfileImage(chatId, null)
    expect(context.getChat(chatId).getProfileImage()).to.be.equal(
@@ -60,5 +60,5 @@
    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.122.0"
+  "version": "1.117.0"
 }
@@ -357,7 +357,7 @@ Exhibit A - Source Code Form License Notice

  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.

 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE
@@ -2,34 +2,34 @@
 high level API reference
 ========================

- :class:`deltachat.Account` (your main entry point, creates the
+- :class:`deltachat.account.Account` (your main entry point, creates the
  other classes)
- :class:`deltachat.Contact`
- :class:`deltachat.Chat`
- :class:`deltachat.Message`
+- :class:`deltachat.contact.Contact`
+- :class:`deltachat.chat.Chat`
+- :class:`deltachat.message.Message`

 Account
 -------

-.. autoclass:: deltachat.Account
+.. autoclass:: deltachat.account.Account
    :members:


 Contact
 -------

-.. autoclass:: deltachat.Contact
+.. autoclass:: deltachat.contact.Contact
    :members:

 Chat
 ----

-.. autoclass:: deltachat.Chat
+.. autoclass:: deltachat.chat.Chat
    :members:

 Message
 -------

-.. autoclass:: deltachat.Message
+.. autoclass:: deltachat.message.Message
    :members:

@@ -32,13 +32,25 @@ class GroupTrackingPlugin:

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

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


 def main(argv=None):
@@ -24,6 +24,8 @@ def test_echo_quit_plugin(acfactory, lp):
    lp.sec("creating a temp account to contact the bot")
    (ac1,) = acfactory.get_online_accounts(1)

+    botproc.await_resync()
+
    lp.sec("sending a message to the bot")
    bot_contact = ac1.create_contact(botproc.addr)
    bot_chat = bot_contact.create_chat()
@@ -52,6 +54,8 @@ def test_group_tracking_plugin(acfactory, lp):
    ac1.add_account_plugin(FFIEventLogger(ac1))
    ac2.add_account_plugin(FFIEventLogger(ac2))

+    botproc.await_resync()
+
    lp.sec("creating bot test group with bot")
    bot_contact = ac1.create_contact(botproc.addr)
    ch = ac1.create_group_chat("bot test group")
@@ -11,11 +11,10 @@ authors = [
    { name = "holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors" },
 ]
 classifiers = [
-    "Development Status :: 5 - Production/Stable",
+    "Development Status :: 4 - Beta",
    "Intended Audience :: Developers",
    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
    "Programming Language :: Python :: 3",
-    "Topic :: Communications :: Chat",
    "Topic :: Communications :: Email",
    "Topic :: Software Development :: Libraries",
 ]
@@ -34,7 +33,6 @@ dynamic = [
 "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"

 [project.entry-points.pytest11]
 "deltachat.testplugin" = "deltachat.testplugin"
@@ -6,7 +6,7 @@ from array import array
 from contextlib import contextmanager
 from email.utils import parseaddr
 from threading import Event
-from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Union
+from typing import Any, Dict, Generator, List, Optional, Union, TYPE_CHECKING

 from . import const, hookspec
 from .capi import ffi, lib
@@ -427,7 +427,7 @@ class Account:

        assert dc_chatlist != ffi.NULL
        chatlist = []
-        for i in range(lib.dc_chatlist_get_cnt(dc_chatlist)):
+        for i in range(0, lib.dc_chatlist_get_cnt(dc_chatlist)):
            chat_id = lib.dc_chatlist_get_chat_id(dc_chatlist, i)
            chatlist.append(Chat(self, chat_id))
        return chatlist
@@ -15,7 +15,7 @@ def as_dc_charpointer(obj):


 def iter_array(dc_array_t, constructor: Callable[[int], T]) -> Generator[T, None, None]:
-    for i in range(lib.dc_array_get_cnt(dc_array_t)):
+    for i in range(0, lib.dc_array_get_cnt(dc_array_t)):
        yield constructor(lib.dc_array_get_id(dc_array_t, i))


@@ -9,11 +9,11 @@ from contextlib import contextmanager
 from queue import Empty, Queue

 from . import const
-from .account import Account
 from .capi import ffi, lib
 from .cutil import from_optional_dc_charpointer
 from .hookspec import account_hookimpl
 from .message import map_system_message
+from .account import Account


 def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
@@ -486,9 +486,6 @@ class Message:
        dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
        return lib.dc_msg_get_download_state(dc_msg)

-    def download_full(self) -> None:
-        lib.dc_download_full_msg(self.account._dc_context, self.id)
-

 # some code for handling DC_MSG_* view types

@@ -510,7 +507,8 @@ def get_viewtype_code_from_name(view_type_name):
    if code is not None:
        return code
    raise ValueError(
-        f"message typecode not found for {view_type_name!r}, available {list(_view_type_mapping.keys())!r}",
+        "message typecode not found for {!r}, "
+        "available {!r}".format(view_type_name, list(_view_type_mapping.keys())),
    )


@@ -9,7 +9,7 @@ import threading
 import time
 import weakref
 from queue import Queue
-from typing import Callable, Dict, List, Optional, Set
+from typing import Callable, List, Optional, Dict, Set

 import pytest
 import requests
@@ -682,6 +682,13 @@ class BotProcess:
                    print("+++IGN:", line)
                    ignored.append(line)

+    def await_resync(self):
+        self.fnmatch_lines(
+            """
+            *Resync: collected * message IDs in folder INBOX*
+        """,
+        )
+

@pytest.fixture()
 def tmp_db_path(tmpdir):
@@ -1,6 +1,6 @@
 from queue import Queue
 from threading import Event
-from typing import TYPE_CHECKING, List
+from typing import List, TYPE_CHECKING

 from .hookspec import Global, account_hookimpl

@@ -15,6 +15,6 @@ class TestEmpty:
    def test_prepare_setup_measurings(self, acfactory):
        acfactory.get_online_accounts(BENCH_NUM)

-    @pytest.mark.parametrize("num", range(BENCH_NUM + 1))
+    @pytest.mark.parametrize("num", range(0, BENCH_NUM + 1))
    def test_setup_online_accounts(self, acfactory, num):
        acfactory.get_online_accounts(num)
@@ -2,14 +2,14 @@ import os
 import queue
 import sys
 import time
-import base64
 from datetime import datetime, timezone

 import pytest
 from imap_tools import AND, U

-import deltachat as dc
-from deltachat import account_hookimpl, Message
+from deltachat import const
+from deltachat.hookspec import account_hookimpl
+from deltachat.message import Message
 from deltachat.tracker import ImexTracker


@@ -36,8 +36,8 @@ def test_basic_imap_api(acfactory, tmp_path):
 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))
+    ac1 = acfactory.new_online_configuring_account(key_gen_type=str(const.DC_KEY_GEN_RSA2048))
+    ac2 = acfactory.new_online_configuring_account(key_gen_type=str(const.DC_KEY_GEN_ED25519))
    acfactory.bring_accounts_online()
    chat = acfactory.get_accepted_chat(ac1, ac2)

@@ -162,9 +162,8 @@ def test_send_file_twice_unicode_filename_mangling(tmp_path, acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat = acfactory.get_accepted_chat(ac1, ac2)

-    basename = "somedäüta"
-    ext = ".html.zip"
-    p = tmp_path / (basename + ext)
+    basename = "somedäüta.html.zip"
+    p = tmp_path / basename
    p.write_text("some data")

    def send_and_receive_message():
@@ -176,20 +175,18 @@ def test_send_file_twice_unicode_filename_mangling(tmp_path, acfactory, lp):

        lp.sec("ac2: receive message")
        ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
-        assert ev.data2 > dc.const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev.data2 > const.DC_CHAT_ID_LAST_SPECIAL
        return ac2.get_message_by_id(ev.data2)

    msg = send_and_receive_message()
    assert msg.text == "withfile"
    assert open(msg.filename).read() == "some data"
-    msg.filename.index(basename)
-    assert msg.filename.endswith(ext)
+    assert msg.filename.endswith(basename)

    msg2 = send_and_receive_message()
    assert msg2.text == "withfile"
    assert open(msg2.filename).read() == "some data"
-    msg2.filename.index(basename)
-    assert msg2.filename.endswith(ext)
+    assert msg2.filename.endswith("html.zip")
    assert msg.filename != msg2.filename


@@ -197,11 +194,10 @@ def test_send_file_html_attachment(tmp_path, acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    chat = acfactory.get_accepted_chat(ac1, ac2)

-    basename = "test"
-    ext = ".html"
+    basename = "test.html"
    content = "<html><body>text</body>data"

-    p = tmp_path / (basename + ext)
+    p = tmp_path / basename
    # write wrong html to see if core tries to parse it
    # (it shouldn't as it's a file attachment)
    p.write_text(content)
@@ -211,12 +207,11 @@ def test_send_file_html_attachment(tmp_path, acfactory, lp):

    lp.sec("ac2: receive message")
    ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
-    assert ev.data2 > dc.const.DC_CHAT_ID_LAST_SPECIAL
+    assert ev.data2 > const.DC_CHAT_ID_LAST_SPECIAL
    msg = ac2.get_message_by_id(ev.data2)

    assert open(msg.filename).read() == content
-    msg.filename.index(basename)
-    assert msg.filename.endswith(ext)
+    assert msg.filename.endswith(basename)


 def test_html_message(acfactory, lp):
@@ -329,59 +324,6 @@ def test_webxdc_message(acfactory, data, lp):
    assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True)))) == 1


-def test_webxdc_huge_update(acfactory, data, lp):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    chat = ac1.create_chat(ac2)
-
-    msg1 = Message.new_empty(ac1, "webxdc")
-    msg1.set_text("message1")
-    msg1.set_file(data.get_path("webxdc/minimal.xdc"))
-    msg1 = chat.send_msg(msg1)
-    assert msg1.is_webxdc()
-    assert msg1.filename
-
-    msg2 = ac2._evtracker.wait_next_incoming_message()
-    assert msg2.is_webxdc()
-
-    payload = "A" * 1000
-    assert msg1.send_status_update({"payload": payload}, "some test data")
-    ac2._evtracker.get_matching("DC_EVENT_WEBXDC_STATUS_UPDATE")
-    update = msg2.get_status_updates()[0]
-    assert update["payload"] == payload
-
-
-def test_webxdc_download_on_demand(acfactory, data, lp):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    acfactory.introduce_each_other([ac1, ac2])
-    chat = acfactory.get_accepted_chat(ac1, ac2)
-
-    msg1 = Message.new_empty(ac1, "webxdc")
-    msg1.set_text("message1")
-    msg1.set_file(data.get_path("webxdc/minimal.xdc"))
-    msg1 = chat.send_msg(msg1)
-    assert msg1.is_webxdc()
-    assert msg1.filename
-
-    msg2 = ac2._evtracker.wait_next_incoming_message()
-    assert msg2.is_webxdc()
-
-    lp.sec("ac2 sets download limit")
-    ac2.set_config("download_limit", "100")
-    assert msg1.send_status_update({"payload": base64.b64encode(os.urandom(50000))}, "some test data")
-    ac2_update = ac2._evtracker.wait_next_incoming_message()
-    assert ac2_update.download_state == dc.const.DC_DOWNLOAD_AVAILABLE
-    assert not msg2.get_status_updates()
-
-    ac2_update.download_full()
-    ac2._evtracker.get_matching("DC_EVENT_WEBXDC_STATUS_UPDATE")
-    assert msg2.get_status_updates()
-
-    # Get a event notifying that the message disappeared from the chat.
-    msgs_changed_event = ac2._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
-    assert msgs_changed_event.data1 == msg2.chat.id
-    assert msgs_changed_event.data2 == 0
-
-
 def test_mvbox_sentbox_threads(acfactory, lp):
    lp.sec("ac1: start with mvbox thread")
    ac1 = acfactory.new_online_configuring_account(mvbox_move=True, sentbox_watch=True)
@@ -409,42 +351,7 @@ def test_move_works(acfactory):

    # Message is downloaded
    ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
-    assert ev.data2 > dc.const.DC_CHAT_ID_LAST_SPECIAL
-
-
-def test_move_avoids_loop(acfactory):
-    """Test that the message is only moved once.
-
-    This is to avoid busy loop if moved message reappears in the Inbox
-    or some scanned folder later.
-    For example, this happens on servers that alias `INBOX.DeltaChat` to `DeltaChat` folder,
-    so the message moved to `DeltaChat` appears as a new message in the `INBOX.DeltaChat` folder.
-    We do not want to move this message from `INBOX.DeltaChat` to `DeltaChat` again.
-    """
-    ac1 = acfactory.new_online_configuring_account()
-    ac2 = acfactory.new_online_configuring_account(mvbox_move=True)
-    acfactory.bring_accounts_online()
-    ac1_chat = acfactory.get_accepted_chat(ac1, ac2)
-    ac1_chat.send_text("Message 1")
-
-    # Message is moved to the DeltaChat folder and downloaded.
-    ac2_msg1 = ac2._evtracker.wait_next_incoming_message()
-    assert ac2_msg1.text == "Message 1"
-
-    # Move the message to the INBOX again.
-    ac2.direct_imap.select_folder("DeltaChat")
-    ac2.direct_imap.conn.move(["*"], "INBOX")
-
-    ac1_chat.send_text("Message 2")
-    ac2_msg2 = ac2._evtracker.wait_next_incoming_message()
-    assert ac2_msg2.text == "Message 2"
-
-    # Check that Message 1 is still in the INBOX folder
-    # and Message 2 is in the DeltaChat folder.
-    ac2.direct_imap.select_folder("INBOX")
-    assert len(ac2.direct_imap.get_all_messages()) == 1
-    ac2.direct_imap.select_folder("DeltaChat")
-    assert len(ac2.direct_imap.get_all_messages()) == 1
+    assert ev.data2 > const.DC_CHAT_ID_LAST_SPECIAL


 def test_move_works_on_self_sent(acfactory):
@@ -627,8 +534,8 @@ def test_send_and_receive_message_markseen(acfactory, lp):
    lp.step("1")
    for _i in range(2):
        ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ")
-        assert ev.data1 > dc.const.DC_CHAT_ID_LAST_SPECIAL
-        assert ev.data2 > dc.const.DC_MSG_ID_LAST_SPECIAL
+        assert ev.data1 > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev.data2 > const.DC_MSG_ID_LAST_SPECIAL
    lp.step("2")

    # Check that ac1 marks the read receipt as read.
@@ -1479,7 +1386,7 @@ def test_reaction_to_partially_fetched_msg(acfactory, lp, tmp_path):
    lp.sec("wait for ac2 to receive a reaction")
    msg2 = ac2._evtracker.wait_next_reactions_changed()
    assert msg2.get_sender_contact().addr == ac1_addr
-    assert msg2.download_state == dc.const.DC_DOWNLOAD_AVAILABLE
+    assert msg2.download_state == const.DC_DOWNLOAD_AVAILABLE
    assert reactions_queue.get() == msg2
    reactions = msg2.get_reactions()
    contacts = reactions.get_contacts()
@@ -1564,7 +1471,7 @@ def test_import_export_online_all(acfactory, tmp_path, data, lp):
    lp.sec(f"export all to {backupdir}")
    with ac1.temp_plugin(ImexTracker()) as imex_tracker:
        ac1.stop_io()
-        ac1.imex(str(backupdir), dc.const.DC_IMEX_EXPORT_BACKUP)
+        ac1.imex(str(backupdir), const.DC_IMEX_EXPORT_BACKUP)

        # check progress events for export
        assert imex_tracker.wait_progress(1, progress_upper_limit=249)
@@ -1679,36 +1586,6 @@ def test_qr_join_chat(acfactory, lp):
    ac1._evtracker.wait_securejoin_inviter_progress(1000)


-def test_qr_new_group_unblocked(acfactory, lp):
-    """Regression test for a bug intoduced in core v1.113.0.
-    ac2 scans a verified group QR code created by ac1.
-    This results in creation of a blocked 1:1 chat with ac1 on ac2,
-    but ac1 contact is not blocked on ac2.
-    Then ac1 creates a group, adds ac2 there and promotes it by sending a message.
-    ac2 should receive a message and create a contact request for the group.
-    Due to a bug previously ac2 created a blocked group.
-    """
-
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1_chat = ac1.create_group_chat("Group for joining", verified=True)
-    qr = ac1_chat.get_join_qr()
-    ac2.qr_join_chat(qr)
-
-    ac1._evtracker.wait_securejoin_inviter_progress(1000)
-
-    ac1_new_chat = ac1.create_group_chat("Another group")
-    ac1_new_chat.add_contact(ac2)
-    ac1_new_chat.send_text("Hello!")
-
-    # Receive "Member added" message.
-    ac2._evtracker.wait_next_incoming_message()
-
-    # Receive "Hello!" message.
-    ac2_msg = ac2._evtracker.wait_next_incoming_message()
-    assert ac2_msg.text == "Hello!"
-    assert ac2_msg.chat.is_contact_request()
-
-
 def test_qr_email_capitalization(acfactory, lp):
    """Regression test for a bug
    that resulted in failure to propagate verification via gossip in a verified group
@@ -1958,15 +1835,15 @@ def test_connectivity(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
    ac1.set_config("scan_all_folders_debounce_secs", "0")

-    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_CONNECTED)

    lp.sec("Test stop_io() and start_io()")
    ac1.stop_io()
-    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_NOT_CONNECTED)

    ac1.start_io()
-    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_CONNECTING)
-    ac1._evtracker.wait_for_connectivity_change(dc.const.DC_CONNECTIVITY_CONNECTING, dc.const.DC_CONNECTIVITY_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_CONNECTING)
+    ac1._evtracker.wait_for_connectivity_change(const.DC_CONNECTIVITY_CONNECTING, const.DC_CONNECTIVITY_CONNECTED)

    lp.sec(
        "Test that after calling start_io(), maybe_network() and waiting for `all_work_done()`, "
@@ -1987,8 +1864,8 @@ def test_connectivity(acfactory, lp):

    ac2.create_chat(ac1).send_text("Hi 2")

-    ac1._evtracker.wait_for_connectivity_change(dc.const.DC_CONNECTIVITY_CONNECTED, dc.const.DC_CONNECTIVITY_WORKING)
-    ac1._evtracker.wait_for_connectivity_change(dc.const.DC_CONNECTIVITY_WORKING, dc.const.DC_CONNECTIVITY_CONNECTED)
+    ac1._evtracker.wait_for_connectivity_change(const.DC_CONNECTIVITY_CONNECTED, const.DC_CONNECTIVITY_WORKING)
+    ac1._evtracker.wait_for_connectivity_change(const.DC_CONNECTIVITY_WORKING, const.DC_CONNECTIVITY_CONNECTED)

    msgs = ac1.create_chat(ac2).get_messages()
    assert len(msgs) == 2
@@ -1998,7 +1875,7 @@ def test_connectivity(acfactory, lp):

    ac1.maybe_network()
    while 1:
-        assert ac1.get_connectivity() == dc.const.DC_CONNECTIVITY_CONNECTED
+        assert ac1.get_connectivity() == const.DC_CONNECTIVITY_CONNECTED
        if ac1.all_work_done():
            break
        ac1._evtracker.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")
@@ -2013,7 +1890,7 @@ def test_connectivity(acfactory, lp):
    ac1.maybe_network()

    while 1:
-        assert ac1.get_connectivity() == dc.const.DC_CONNECTIVITY_CONNECTED
+        assert ac1.get_connectivity() == const.DC_CONNECTIVITY_CONNECTED
        if ac1.all_work_done():
            break
        ac1._evtracker.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")
@@ -2022,10 +1899,10 @@ def test_connectivity(acfactory, lp):

    ac1.set_config("configured_mail_pw", "abc")
    ac1.stop_io()
-    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_NOT_CONNECTED)
    ac1.start_io()
-    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_CONNECTING)
-    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_CONNECTING)
+    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_NOT_CONNECTED)


 def test_fetch_deleted_msg(acfactory, lp):
@@ -2508,9 +2385,9 @@ def test_archived_muted_chat(acfactory, lp):
    lp.sec("wait for ac2 to receive DC_EVENT_MSGS_CHANGED for DC_CHAT_ID_ARCHIVED_LINK")
    while 1:
        ev = ac2._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
-        if ev.data1 == dc.const.DC_CHAT_ID_ARCHIVED_LINK:
+        if ev.data1 == const.DC_CHAT_ID_ARCHIVED_LINK:
            assert ev.data2 == 0
-            archive = ac2.get_chat_by_id(dc.const.DC_CHAT_ID_ARCHIVED_LINK)
+            archive = ac2.get_chat_by_id(const.DC_CHAT_ID_ARCHIVED_LINK)
            assert archive.count_fresh_messages() == 1
            assert chat2.count_fresh_messages() == 1
            break
@@ -49,9 +49,10 @@ class TestOnlineInCreation:
        assert str(tmp_path) != ac1.get_blobdir()
        src = tmp_path / "file.txt"
        src.write_text("hello there\n")
-        msg = chat.send_file(str(src))
-        assert msg.filename.startswith(os.path.join(ac1.get_blobdir(), "file"))
-        assert msg.filename.endswith(".txt")
+        chat.send_file(str(src))
+
+        blob_src = os.path.join(ac1.get_blobdir(), "file.txt")
+        assert os.path.exists(blob_src), "file.txt not copied to blobdir"

    def test_forward_increation(self, acfactory, data, lp):
        ac1, ac2 = acfactory.get_online_accounts(2)
@@ -4,11 +4,12 @@ from datetime import datetime, timedelta, timezone

 import pytest

-import deltachat as dc
+from deltachat import Account, const
 from deltachat.capi import ffi, lib
 from deltachat.cutil import iter_array
+from deltachat.hookspec import account_hookimpl
+from deltachat.message import Message
 from deltachat.tracker import ImexFailed
-from deltachat import Account, account_hookimpl, Message


@pytest.mark.parametrize(
@@ -298,13 +299,13 @@ class TestOfflineChat:
        assert not d["draft"] if chat.get_draft() is None else chat.get_draft()

    def test_group_chat_creation_with_translation(self, ac1):
-        ac1.set_stock_translation(dc.const.DC_STR_GROUP_NAME_CHANGED_BY_YOU, "abc %1$s xyz %2$s")
+        ac1.set_stock_translation(const.DC_STR_GROUP_NAME_CHANGED_BY_YOU, "abc %1$s xyz %2$s")
        ac1._evtracker.consume_events()
        with pytest.raises(ValueError):
-            ac1.set_stock_translation(dc.const.DC_STR_FILE, "xyz %1$s")
+            ac1.set_stock_translation(const.DC_STR_FILE, "xyz %1$s")
        ac1._evtracker.get_matching("DC_EVENT_WARNING")
        with pytest.raises(ValueError):
-            ac1.set_stock_translation(dc.const.DC_STR_CONTACT_NOT_VERIFIED, "xyz %2$s")
+            ac1.set_stock_translation(const.DC_STR_CONTACT_NOT_VERIFIED, "xyz %2$s")
        ac1._evtracker.get_matching("DC_EVENT_WARNING")
        with pytest.raises(ValueError):
            ac1.set_stock_translation(500, "xyz %1$s")
@@ -480,19 +481,6 @@ class TestOfflineChat:
        contact2 = ac1.create_contact("display1 <x@example.org>", "real")
        assert contact2.name == "real"

-    def test_send_lots_of_offline_msgs(self, acfactory):
-        ac1 = acfactory.get_pseudo_configured_account()
-        ac1.set_config("configured_mail_server", "example.org")
-        ac1.set_config("configured_mail_user", "example.org")
-        ac1.set_config("configured_mail_pw", "example.org")
-        ac1.set_config("configured_send_server", "example.org")
-        ac1.set_config("configured_send_user", "example.org")
-        ac1.set_config("configured_send_pw", "example.org")
-        ac1.start_io()
-        chat = ac1.create_contact("some1@example.org", name="some1").create_chat()
-        for i in range(50):
-            chat.send_text("hello")
-
    def test_create_chat_simple(self, acfactory):
        ac1 = acfactory.get_pseudo_configured_account()
        contact1 = ac1.create_contact("some1@example.org", name="some1")
@@ -817,7 +805,7 @@ class TestOfflineChat:

        lp.sec("check message count of only system messages (without daymarkers)")
        dc_array = ffi.gc(
-            lib.dc_get_chat_msgs(ac1._dc_context, chat.id, dc.const.DC_GCM_INFO_ONLY, 0),
+            lib.dc_get_chat_msgs(ac1._dc_context, chat.id, const.DC_GCM_INFO_ONLY, 0),
            lib.dc_array_unref,
        )
        assert len(list(iter_array(dc_array, lambda x: x))) == 2
@@ -1,7 +1,6 @@
 from queue import Queue

-import deltachat as dc
-from deltachat import capi, cutil, register_global_plugin
+from deltachat import capi, const, cutil, register_global_plugin
 from deltachat.capi import ffi, lib
 from deltachat.hookspec import global_hookimpl
 from deltachat.testplugin import (
@@ -133,20 +132,20 @@ def test_empty_blobdir(tmp_path):


 def test_event_defines():
-    assert dc.const.DC_EVENT_INFO == 100
-    assert dc.const.DC_CONTACT_ID_SELF
+    assert const.DC_EVENT_INFO == 100
+    assert const.DC_CONTACT_ID_SELF


 def test_sig():
    sig = capi.lib.dc_event_has_string_data
-    assert not sig(dc.const.DC_EVENT_MSGS_CHANGED)
-    assert sig(dc.const.DC_EVENT_INFO)
-    assert sig(dc.const.DC_EVENT_WARNING)
-    assert sig(dc.const.DC_EVENT_ERROR)
-    assert sig(dc.const.DC_EVENT_SMTP_CONNECTED)
-    assert sig(dc.const.DC_EVENT_IMAP_CONNECTED)
-    assert sig(dc.const.DC_EVENT_SMTP_MESSAGE_SENT)
-    assert sig(dc.const.DC_EVENT_IMEX_FILE_WRITTEN)
+    assert not sig(const.DC_EVENT_MSGS_CHANGED)
+    assert sig(const.DC_EVENT_INFO)
+    assert sig(const.DC_EVENT_WARNING)
+    assert sig(const.DC_EVENT_ERROR)
+    assert sig(const.DC_EVENT_SMTP_CONNECTED)
+    assert sig(const.DC_EVENT_IMAP_CONNECTED)
+    assert sig(const.DC_EVENT_SMTP_MESSAGE_SENT)
+    assert sig(const.DC_EVENT_IMEX_FILE_WRITTEN)


 def test_markseen_invalid_message_ids(acfactory):
@@ -1 +1 @@
-2023-09-12
+2023-06-15
@@ -28,6 +28,8 @@ and an own build machine.

 - `zig-rpc-server.sh` compiles binaries of `deltachat-rpc-server` using Zig toolchain statically linked against musl libc.

+- `zig-ffi.sh` compiles C libraries into LLVM bitcode using Zig toolchain with musl libc.
+
 - `android-rpc-server.sh` compiles binaries of `deltachat-rpc-server` using Android NDK.

 ## Triggering runs on the build machine locally (fast!)
@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.72.0
+RUST_VERSION=1.68.0

 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
@@ -44,7 +44,7 @@ def file2url(f):

 def process_opt(data):
    if not "opt" in data:
-        return "ProviderOptions::new()"
+        return "Default::default()"
    opt = "ProviderOptions {\n"
    opt_data = data.get("opt", "")
    for key in opt_data:
@@ -54,7 +54,7 @@ def process_opt(data):
        if value in {"True", "False"}:
            value = value.lower()
        opt += "        " + key + ": " + value + ",\n"
-    opt += "        ..ProviderOptions::new()\n"
+    opt += "        ..Default::default()\n"
    opt += "    }"
    return opt

@@ -62,7 +62,7 @@ def process_opt(data):
 def process_config_defaults(data):
    if not "config_defaults" in data:
        return "None"
-    defaults = "Some(&[\n"
+    defaults = "Some(vec![\n"
    config_defaults = data.get("config_defaults", "")
    for key in config_defaults:
        value = str(config_defaults[key])
@@ -96,11 +96,11 @@ def process_data(data, file):
            raise TypeError("domain used twice: " + domain)
        domains_set.add(domain)

-        domains += '    ("' + domain + '", &' + file2varname(file) + "),\n"
+        domains += '    ("' + domain + '", &*' + file2varname(file) + "),\n"
        comment += domain + ", "

    ids = ""
-    ids += '    ("' + file2id(file) + '", &' + file2varname(file) + "),\n"
+    ids += '    ("' + file2id(file) + '", &*' + file2varname(file) + "),\n"

    server = ""
    has_imap = False
@@ -155,18 +155,18 @@ def process_data(data, file):
        provider += (
            "static "
            + file2varname(file)
-            + ": Provider = Provider {\n"
+            + ": Lazy<Provider> = Lazy::new(|| Provider {\n"
        )
        provider += '    id: "' + file2id(file) + '",\n'
        provider += "    status: Status::" + status.capitalize() + ",\n"
        provider += '    before_login_hint: "' + before_login_hint + '",\n'
        provider += '    after_login_hint: "' + after_login_hint + '",\n'
        provider += '    overview_page: "' + file2url(file) + '",\n'
-        provider += "    server: &[\n" + server + "    ],\n"
+        provider += "    server: vec![\n" + server + "    ],\n"
        provider += "    opt: " + opt + ",\n"
        provider += "    config_defaults: " + config_defaults + ",\n"
        provider += "    oauth2_authorizer: " + oauth2 + ",\n"
-        provider += "};\n\n"
+        provider += "});\n\n"
    else:
        raise TypeError("SMTP and IMAP must be specified together or left out both")

@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# Build FFI library using zig.
+
+set -x
+set -e
+
+export RUSTFLAGS="-Clinker-plugin-lto"
+export CFLAGS="-fno-unwind-tables -fno-exceptions -fno-asynchronous-unwind-tables -fomit-frame-pointer"
+
+build() {
+	cargo build --release --target $1 -p deltachat_ffi --features vendored
+}
+
+CC="$PWD/scripts/zig-cc" \
+TARGET_CC="$PWD/scripts/zig-cc" \
+CARGO_TARGET_I686_UNKNOWN_LINUX_MUSL_LINKER="$PWD/scripts/zig-cc" \
+LD="$PWD/scripts/zig-cc" \
+ZIG_TARGET="x86-linux-musl" \
+build i686-unknown-linux-musl
+
+CC="$PWD/scripts/zig-cc" \
+TARGET_CC="$PWD/scripts/zig-cc" \
+CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER="$PWD/scripts/zig-cc" \
+LD="$PWD/scripts/zig-cc" \
+ZIG_TARGET="arm-linux-musleabihf" \
+ZIG_CPU="generic+v7a+vfp3-d32+thumb2-neon" \
+build armv7-unknown-linux-musleabihf
+
+CC="$PWD/scripts/zig-cc" \
+TARGET_CC="$PWD/scripts/zig-cc" \
+CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER="$PWD/scripts/zig-cc" \
+LD="$PWD/scripts/zig-cc" \
+ZIG_TARGET="x86_64-linux-musl" \
+build x86_64-unknown-linux-musl
+
+CC="$PWD/scripts/zig-cc" \
+TARGET_CC="$PWD/scripts/zig-cc" \
+CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="$PWD/scripts/zig-cc" \
+LD="$PWD/scripts/zig-cc" \
+ZIG_TARGET="aarch64-linux-musl" \
+build aarch64-unknown-linux-musl
@@ -9,9 +9,9 @@ set -e
 unset RUSTFLAGS

 # Pin Rust version to avoid uncontrolled changes in the compiler and linker flags.
-export RUSTUP_TOOLCHAIN=1.72.0
+export RUSTUP_TOOLCHAIN=1.70.0

-ZIG_VERSION=0.11.0
+ZIG_VERSION=0.11.0-dev.2213+515e1c93e

 # Download Zig
 rm -fr "$ZIG_VERSION" "zig-linux-x86_64-$ZIG_VERSION.tar.xz"
@@ -8,9 +8,9 @@ set -e
 unset RUSTFLAGS

 # Pin Rust version to avoid uncontrolled changes in the compiler and linker flags.
-export RUSTUP_TOOLCHAIN=1.72.0
+export RUSTUP_TOOLCHAIN=1.70.0

-ZIG_VERSION=0.11.0
+ZIG_VERSION=0.11.0-dev.2213+515e1c93e

 # Download Zig
 rm -fr "$ZIG_VERSION" "zig-linux-x86_64-$ZIG_VERSION.tar.xz"
@@ -296,10 +296,10 @@ impl Accounts {
 }

 /// Configuration file name.
-const CONFIG_NAME: &str = "accounts.toml";
+pub const CONFIG_NAME: &str = "accounts.toml";

 /// Database file name.
-const DB_NAME: &str = "dc.db";
+pub const DB_NAME: &str = "dc.db";

 /// Account manager configuration file.
 #[derive(Debug, Clone, PartialEq)]
@@ -357,6 +357,7 @@ mod tests {
    use super::*;
    use crate::aheader::EncryptPreference;
    use crate::e2ee;
+    use crate::message;
    use crate::mimeparser;
    use crate::peerstate::Peerstate;
    use crate::securejoin::get_securejoin_qr;
@@ -704,7 +705,7 @@ Authentication-Results: dkim=";
        let received = tcm
            .try_send_recv(&alice, &bob2, "My credit card number is 1234")
            .await;
-        assert!(!received.text.contains("1234"));
+        assert!(!received.text.as_ref().unwrap().contains("1234"));
        assert!(received.error.is_some());

        tcm.section("Turns out bob2 wasn't an attacker at all, Bob just has a new phone and DKIM just stopped working.");
@@ -785,7 +786,7 @@ Authentication-Results: dkim=";
            .insert_str(0, "List-Post: <mailto:deltachat-community.example.net>\n");
        let rcvd = alice.recv_msg(&sent).await;
        assert!(!rcvd.get_showpadlock());
-        assert_eq!(&rcvd.text, "hellooo in the mailinglist again");
+        assert_eq!(&rcvd.text.unwrap(), "hellooo in the mailinglist again");

        Ok(())
    }
@@ -824,9 +825,7 @@ Authentication-Results: dkim=";
        // Disallowing keychanges is disabled for now:
        // assert!(rcvd.error.unwrap().contains("DKIM failed"));
        // The message info should contain a warning:
-        assert!(rcvd
-            .id
-            .get_info(&bob)
+        assert!(message::get_msg_info(&bob, rcvd.id)
            .await
            .unwrap()
            .contains("KEYCHANGES NOT ALLOWED"));
@@ -9,7 +9,7 @@ use std::path::{Path, PathBuf};

 use anyhow::{format_err, Context as _, Result};
 use futures::StreamExt;
-use image::{DynamicImage, GenericImageView, ImageFormat, ImageOutputFormat};
+use image::{DynamicImage, ImageFormat, ImageOutputFormat};
 use num_traits::FromPrimitive;
 use tokio::io::AsyncWriteExt;
 use tokio::{fs, io};
@@ -323,35 +323,18 @@ impl<'a> BlobObject<'a> {
                MediaQuality::Worse => constants::WORSE_AVATAR_SIZE,
            };

-        let maybe_sticker = &mut false;
        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.
-        if let Some(new_name) = self.recode_to_size(
-            context,
-            blob_abs,
-            maybe_sticker,
-            img_wh,
-            20_000,
-            strict_limits,
-        )? {
+        if let Some(new_name) =
+            self.recode_to_size(context, blob_abs, img_wh, 20_000, strict_limits)?
+        {
            self.name = new_name;
        }
        Ok(())
    }

-    /// Recodes an image pointed by a [BlobObject] so that it fits into limits on the image width,
-    /// height and file size specified by the config.
-    ///
-    /// On some platforms images are passed to the core as [`crate::message::Viewtype::Sticker`] in
-    /// which case `maybe_sticker` flag should be set. We recheck if an image is a true sticker
-    /// assuming that it must have at least one fully transparent corner, otherwise this flag is
-    /// reset.
-    pub async fn recode_to_image_size(
-        &mut self,
-        context: &Context,
-        maybe_sticker: &mut bool,
-    ) -> Result<()> {
+    pub async fn recode_to_image_size(&mut self, context: &Context) -> Result<()> {
        let blob_abs = self.to_abs_path();
        let (img_wh, max_bytes) =
            match MediaQuality::from_i32(context.get_config_int(Config::MediaQuality).await?)
@@ -364,14 +347,9 @@ impl<'a> BlobObject<'a> {
                MediaQuality::Worse => (constants::WORSE_IMAGE_SIZE, constants::WORSE_IMAGE_BYTES),
            };
        let strict_limits = false;
-        if let Some(new_name) = self.recode_to_size(
-            context,
-            blob_abs,
-            maybe_sticker,
-            img_wh,
-            max_bytes,
-            strict_limits,
-        )? {
+        if let Some(new_name) =
+            self.recode_to_size(context, blob_abs, img_wh, max_bytes, strict_limits)?
+        {
            self.name = new_name;
        }
        Ok(())
@@ -380,37 +358,20 @@ impl<'a> BlobObject<'a> {
    /// If `!strict_limits`, then if `max_bytes` is exceeded, reduce the image to `img_wh` and just
    /// proceed with the result.
    fn recode_to_size(
-        &mut self,
+        &self,
        context: &Context,
        mut blob_abs: PathBuf,
-        maybe_sticker: &mut bool,
        mut img_wh: u32,
        max_bytes: usize,
        strict_limits: bool,
    ) -> Result<Option<String>> {
-        let mut no_exif = false;
-        let no_exif_ref = &mut no_exif;
-        let res = tokio::task::block_in_place(move || {
-            let (nr_bytes, exif) = self.metadata()?;
-            *no_exif_ref = exif.is_none();
+        tokio::task::block_in_place(move || {
            let mut img = image::open(&blob_abs).context("image decode failure")?;
+            let (nr_bytes, exif) = self.metadata()?;
            let orientation = exif.as_ref().map(|exif| exif_orientation(exif, context));
            let mut encoded = Vec::new();
            let mut changed_name = None;

-            if *maybe_sticker {
-                let x_max = img.width().saturating_sub(1);
-                let y_max = img.height().saturating_sub(1);
-                *maybe_sticker = img.in_bounds(x_max, y_max)
-                    && (img.get_pixel(0, 0).0[3] == 0
-                        || img.get_pixel(x_max, 0).0[3] == 0
-                        || img.get_pixel(0, y_max).0[3] == 0
-                        || img.get_pixel(x_max, y_max).0[3] == 0);
-            }
-            if *maybe_sticker && exif.is_none() {
-                return Ok(None);
-            }
-
            img = match orientation {
                Some(90) => img.rotate90(),
                Some(180) => img.rotate180(),
@@ -508,21 +469,7 @@ impl<'a> BlobObject<'a> {
            }

            Ok(changed_name)
-        });
-        match res {
-            Ok(_) => res,
-            Err(err) => {
-                if !strict_limits && no_exif {
-                    warn!(
-                        context,
-                        "Cannot recode image, using original data: {err:#}.",
-                    );
-                    Ok(None)
-                } else {
-                    Err(err)
-                }
-            }
-        }
+        })
    }

    /// Returns image file size and Exif.
@@ -913,18 +860,10 @@ mod tests {
            file.metadata().await.unwrap().len()
        }

-        let mut blob = BlobObject::new_from_path(&t, &avatar_blob).await.unwrap();
-        let maybe_sticker = &mut false;
+        let blob = BlobObject::new_from_path(&t, &avatar_blob).await.unwrap();
        let strict_limits = true;
-        blob.recode_to_size(
-            &t,
-            blob.to_abs_path(),
-            maybe_sticker,
-            1000,
-            3000,
-            strict_limits,
-        )
-        .unwrap();
+        blob.recode_to_size(&t, blob.to_abs_path(), 1000, 3000, strict_limits)
+            .unwrap();
        assert!(file_size(&avatar_blob).await <= 3000);
        assert!(file_size(&avatar_blob).await > 2000);
        tokio::task::block_in_place(move || {
@@ -984,7 +923,6 @@ mod tests {
    async fn test_recode_image_1() {
        let bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
        send_image_check_mediaquality(
-            Viewtype::Image,
            Some("0"),
            bytes,
            "jpg",
@@ -998,7 +936,6 @@ mod tests {
        .await
        .unwrap();
        send_image_check_mediaquality(
-            Viewtype::Image,
            Some("1"),
            bytes,
            "jpg",
@@ -1018,7 +955,6 @@ mod tests {
        // The "-rotated" files are rotated by 270 degrees using the Exif metadata
        let bytes = include_bytes!("../test-data/image/rectangle2000x1800-rotated.jpg");
        let img_rotated = send_image_check_mediaquality(
-            Viewtype::Image,
            Some("0"),
            bytes,
            "jpg",
@@ -1038,7 +974,6 @@ mod tests {
        let bytes = buf.into_inner();

        let img_rotated = send_image_check_mediaquality(
-            Viewtype::Image,
            Some("1"),
            &bytes,
            "jpg",
@@ -1059,7 +994,6 @@ mod tests {
        let bytes = include_bytes!("../test-data/image/screenshot.png");

        send_image_check_mediaquality(
-            Viewtype::Image,
            Some("0"),
            bytes,
            "png",
@@ -1074,7 +1008,6 @@ mod tests {
        .unwrap();

        send_image_check_mediaquality(
-            Viewtype::Image,
            Some("1"),
            bytes,
            "png",
@@ -1087,29 +1020,12 @@ mod tests {
        )
        .await
        .unwrap();
-
-        // This will be sent as Image, see [`BlobObject::maybe_sticker`] for explanation.
-        send_image_check_mediaquality(
-            Viewtype::Sticker,
-            Some("0"),
-            bytes,
-            "png",
-            false, // no Exif
-            1920,
-            1080,
-            0,
-            1920,
-            1080,
-        )
-        .await
-        .unwrap();
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_recode_image_huge_jpg() {
        let bytes = include_bytes!("../test-data/image/screenshot.jpg");
        send_image_check_mediaquality(
-            Viewtype::Image,
            Some("0"),
            bytes,
            "jpg",
@@ -1143,7 +1059,6 @@ mod tests {

    #[allow(clippy::too_many_arguments)]
    async fn send_image_check_mediaquality(
-        viewtype: Viewtype,
        media_quality_config: Option<&str>,
        bytes: &[u8],
        extension: &str,
@@ -1175,7 +1090,7 @@ mod tests {
            assert!(exif.is_none());
        }

-        let mut msg = Message::new(viewtype);
+        let mut msg = Message::new(Viewtype::Image);
        msg.set_file(file.to_str().unwrap(), None);
        let chat = alice.create_chat(&bob).await;
        let sent = alice.send_msg(chat.id, &mut msg).await;
@@ -1189,7 +1104,6 @@ mod tests {
        );

        let bob_msg = bob.recv_msg(&sent).await;
-        assert_eq!(bob_msg.get_viewtype(), Viewtype::Image);
        assert_eq!(bob_msg.get_width() as u32, compressed_width);
        assert_eq!(bob_msg.get_height() as u32, compressed_height);
        let file = bob_msg.get_file(&bob).unwrap();
@@ -10,10 +10,8 @@ use crate::constants::{
 use crate::contact::{Contact, ContactId};
 use crate::context::Context;
 use crate::message::{Message, MessageState, MsgId};
-use crate::param::{Param, Params};
 use crate::stock_str;
 use crate::summary::Summary;
-use crate::tools::IsNoneOrEmpty;

 /// An object representing a single chatlist in memory.
 ///
@@ -206,84 +204,34 @@ impl Chatlist {
                )
                .await?
        } else {
-            let mut ids = if flag_for_forwarding {
-                let sort_id_up = ChatId::lookup_by_contact(context, ContactId::SELF)
+            //  show normal chatlist
+            let sort_id_up = if flag_for_forwarding {
+                ChatId::lookup_by_contact(context, ContactId::SELF)
                    .await?
-                    .unwrap_or_default();
-                let process_row = |row: &rusqlite::Row| {
-                    let chat_id: ChatId = row.get(0)?;
-                    let typ: Chattype = row.get(1)?;
-                    let param: Params = row.get::<_, String>(2)?.parse().unwrap_or_default();
-                    let msg_id: Option<MsgId> = row.get(3)?;
-                    Ok((chat_id, typ, param, msg_id))
-                };
-                let process_rows = |rows: rusqlite::MappedRows<_>| {
-                    rows.filter_map(|row: std::result::Result<(_, _, Params, _), _>| match row {
-                        Ok((chat_id, typ, param, msg_id)) => {
-                            if typ == Chattype::Mailinglist
-                                && param.get(Param::ListPost).is_none_or_empty()
-                            {
-                                None
-                            } else {
-                                Some(Ok((chat_id, msg_id)))
-                            }
-                        }
-                        Err(e) => Some(Err(e)),
-                    })
-                    .collect::<std::result::Result<Vec<_>, _>>()
-                    .map_err(Into::into)
-                };
-                // Return ProtectionBroken chats also, as that may happen to a verified chat at any
-                // time. It may be confusing if a chat that is normally in the list disappears
-                // suddenly. The UI need to deal with that case anyway.
-                context.sql.query_map(
-                    "SELECT c.id, c.type, c.param, m.id
-                     FROM chats c
-                     LEFT JOIN msgs m
-                            ON c.id=m.chat_id
-                           AND m.id=(
-                                   SELECT id
-                                     FROM msgs
-                                    WHERE chat_id=c.id
-                                      AND (hidden=0 OR state=?)
-                                      ORDER BY timestamp DESC, id DESC LIMIT 1)
-                     WHERE c.id>9 AND c.id!=?
-                       AND c.blocked=0
-                       AND NOT c.archived=?
-                       AND (c.type!=? OR c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?))
-                     GROUP BY c.id
-                     ORDER BY c.id=? DESC, c.archived=? DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                    (
-                        MessageState::OutDraft, skip_id, ChatVisibility::Archived,
-                        Chattype::Group, ContactId::SELF,
-                        sort_id_up, ChatVisibility::Pinned,
-                    ),
-                    process_row,
-                    process_rows,
-                ).await?
+                    .unwrap_or_default()
            } else {
-                //  show normal chatlist
-                context.sql.query_map(
-                    "SELECT c.id, m.id
-                     FROM chats c
-                     LEFT JOIN msgs m
-                            ON c.id=m.chat_id
-                           AND m.id=(
-                                   SELECT id
-                                     FROM msgs
-                                    WHERE chat_id=c.id
-                                      AND (hidden=0 OR state=?)
-                                      ORDER BY timestamp DESC, id DESC LIMIT 1)
-                     WHERE c.id>9 AND c.id!=?
-                       AND (c.blocked=0 OR c.blocked=2)
-                       AND NOT c.archived=?
-                     GROUP BY c.id
-                     ORDER BY c.id=0 DESC, c.archived=? DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                    (MessageState::OutDraft, skip_id, ChatVisibility::Archived, ChatVisibility::Pinned),
-                    process_row,
-                    process_rows,
-                ).await?
+                ChatId::new(0)
            };
+            let mut ids = context.sql.query_map(
+                "SELECT c.id, m.id
+                 FROM chats c
+                 LEFT JOIN msgs m
+                        ON c.id=m.chat_id
+                       AND m.id=(
+                               SELECT id
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?1)
+                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
+                 WHERE c.id>9 AND c.id!=?2
+                   AND (c.blocked=0 OR (c.blocked=2 AND NOT ?3))
+                   AND NOT c.archived=?4
+                 GROUP BY c.id
+                 ORDER BY c.id=?5 DESC, c.archived=?6 DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
+                (MessageState::OutDraft, skip_id, flag_for_forwarding, ChatVisibility::Archived, sort_id_up, ChatVisibility::Pinned),
+                process_row,
+                process_rows,
+            ).await?;
            if !flag_no_specials && get_archived_cnt(context).await? > 0 {
                if ids.is_empty() && flag_add_alldone_hint {
                    ids.push((DC_CHAT_ID_ALLDONE_HINT, None));
@@ -296,27 +244,6 @@ impl Chatlist {
        Ok(Chatlist { ids })
    }

-    /// Converts list of chat IDs to a chatlist.
-    pub(crate) async fn from_chat_ids(context: &Context, chat_ids: &[ChatId]) -> Result<Self> {
-        let mut ids = Vec::new();
-        for &chat_id in chat_ids {
-            let msg_id: Option<MsgId> = context
-                .sql
-                .query_get_value(
-                    "SELECT id
-                   FROM msgs
-                  WHERE chat_id=?1
-                    AND (hidden=0 OR state=?2)
-                  ORDER BY timestamp DESC, id DESC LIMIT 1",
-                    (chat_id, MessageState::OutDraft),
-                )
-                .await
-                .with_context(|| format!("failed to get msg ID for chat {}", chat_id))?;
-            ids.push((chat_id, msg_id));
-        }
-        Ok(Chatlist { ids })
-    }
-
    /// Find out the number of chats.
    pub fn len(&self) -> usize {
        self.ids.len()
@@ -392,7 +319,7 @@ impl Chatlist {
            } else {
                match chat.typ {
                    Chattype::Group | Chattype::Broadcast | Chattype::Mailinglist => {
-                        let lastcontact = Contact::get_by_id(context, lastmsg.from_id)
+                        let lastcontact = Contact::load_from_db(context, lastmsg.from_id)
                            .await
                            .context("loading contact failed")?;
                        (Some(lastmsg), Some(lastcontact))
@@ -461,9 +388,7 @@ pub async fn get_last_message_for_chat(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::chat::{
-        create_group_chat, get_chat_contacts, remove_contact_from_chat, ProtectionStatus,
-    };
+    use crate::chat::{create_group_chat, get_chat_contacts, ProtectionStatus};
    use crate::message::Viewtype;
    use crate::receive_imf::receive_imf;
    use crate::stock_str::StockMessage;
@@ -499,7 +424,7 @@ mod tests {
        // 2s here.
        for chat_id in &[chat_id1, chat_id3, chat_id2] {
            let mut msg = Message::new(Viewtype::Text);
-            msg.set_text("hello".to_string());
+            msg.set_text(Some("hello".to_string()));
            chat_id.set_draft(&t, Some(&mut msg)).await.unwrap();
        }

@@ -548,14 +473,6 @@ mod tests {
            .await
            .unwrap()
            .is_self_talk());
-
-        remove_contact_from_chat(&t, chats.get_chat_id(1).unwrap(), ContactId::SELF)
-            .await
-            .unwrap();
-        let chats = Chatlist::try_load(&t, DC_GCL_FOR_FORWARDING, None, None)
-            .await
-            .unwrap();
-        assert!(chats.len() == 1);
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -719,7 +636,7 @@ mod tests {
            .unwrap();

        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("foo:\nbar \r\n test".to_string());
+        msg.set_text(Some("foo:\nbar \r\n test".to_string()));
        chat_id1.set_draft(&t, Some(&mut msg)).await.unwrap();

        let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
@@ -1,7 +1,6 @@
 //! # Key-value configuration management.

 use std::env;
-use std::path::Path;
 use std::str::FromStr;

 use anyhow::{ensure, Context as _, Result};
@@ -330,11 +329,7 @@ impl Context {
        let value = match key {
            Config::Selfavatar => {
                let rel_path = self.sql.get_raw_config(key.as_ref()).await?;
-                rel_path.map(|p| {
-                    get_abs_path(self, Path::new(&p))
-                        .to_string_lossy()
-                        .into_owned()
-                })
+                rel_path.map(|p| get_abs_path(self, p).to_string_lossy().into_owned())
            }
            Config::SysVersion => Some((*DC_VERSION_STR).clone()),
            Config::SysMsgsizeMaxRecommended => Some(format!("{RECOMMENDED_FILE_SIZE}")),
@@ -130,8 +130,8 @@ async fn on_configure_completed(
    old_addr: Option<String>,
 ) -> Result<()> {
    if let Some(provider) = param.provider {
-        if let Some(config_defaults) = provider.config_defaults {
-            for def in config_defaults {
+        if let Some(config_defaults) = &provider.config_defaults {
+            for def in config_defaults.iter() {
                if !context.config_exists(def.key).await? {
                    info!(context, "apply config_defaults {}={}", def.key, def.value);
                    context.set_config(def.key, Some(def.value)).await?;
@@ -146,7 +146,7 @@ async fn on_configure_completed(

        if !provider.after_login_hint.is_empty() {
            let mut msg = Message::new(Viewtype::Text);
-            msg.text = provider.after_login_hint.to_string();
+            msg.text = Some(provider.after_login_hint.to_string());
            if chat::add_device_msg(context, Some("core-provider-info"), Some(&mut msg))
                .await
                .is_err()
@@ -161,7 +161,7 @@ async fn on_configure_completed(
            if !addr_cmp(&new_addr, &old_addr) {
                let mut msg = Message::new(Viewtype::Text);
                msg.text =
-                    stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await;
+                    Some(stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await);
                chat::add_device_msg(context, None, Some(&mut msg))
                    .await
                    .context("Cannot add AEAP explanation")
@@ -318,7 +318,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
    }

    // respect certificate setting from function parameters
-    for server in &mut servers {
+    for mut server in &mut servers {
        let certificate_checks = match server.protocol {
            Protocol::Imap => param.imap.certificate_checks,
            Protocol::Smtp => param.smtp.certificate_checks,
@@ -462,12 +462,9 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {

    progress!(ctx, 910);

-    if let Some(configured_addr) = ctx.get_config(Config::ConfiguredAddr).await? {
-        if configured_addr != param.addr {
-            // Switched account, all server UIDs we know are invalid
-            info!(ctx, "Scheduling resync because the address has changed.");
-            job::schedule_resync(ctx).await?;
-        }
+    if ctx.get_config(Config::ConfiguredAddr).await?.as_deref() != Some(&param.addr) {
+        // Switched account, all server UIDs we know are invalid
+        job::schedule_resync(ctx).await?;
    }

    // the trailing underscore is correct
@@ -656,7 +653,7 @@ async fn try_smtp_one_param(
        })
    } else {
        info!(context, "success: {}", inf);
-        smtp.disconnect();
+        smtp.disconnect().await;
        Ok(())
    }
 }
@@ -234,7 +234,7 @@ fn parse_serverparams(in_emailaddr: &str, xml_raw: &str) -> Result<Vec<ServerPar
    let res = moz_ac
        .incoming_servers
        .into_iter()
-        .chain(moz_ac.outgoing_servers)
+        .chain(moz_ac.outgoing_servers.into_iter())
        .filter_map(|server| {
            let protocol = match server.typ.as_ref() {
                "imap" => Some(Protocol::Imap),
@@ -62,15 +62,8 @@ pub enum MediaQuality {
 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.
@@ -238,7 +231,6 @@ mod tests {
        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]
@@ -5,7 +5,7 @@ use std::collections::BinaryHeap;
 use std::convert::{TryFrom, TryInto};
 use std::fmt;
 use std::ops::Deref;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};

 use anyhow::{bail, ensure, Context as _, Result};
@@ -338,33 +338,11 @@ impl Default for VerifiedStatus {
 }

 impl Contact {
-    /// Loads a single contact object from the database.
-    ///
-    /// Returns an error if the contact does not exist.
-    ///
-    /// For contact ContactId::SELF (1), the function returns sth.
-    /// like "Me" in the selected language and the email address
-    /// defined by set_config().
-    ///
-    /// For contact ContactId::DEVICE, the function overrides
-    /// the contact name and status with localized address.
-    pub async fn get_by_id(context: &Context, contact_id: ContactId) -> Result<Self> {
-        let contact = Self::get_by_id_optional(context, contact_id)
-            .await?
-            .with_context(|| format!("contact {contact_id} not found"))?;
-        Ok(contact)
-    }
-
-    /// Loads a single contact object from the database.
-    ///
-    /// Similar to [`Contact::get_by_id()`] but returns `None` if the contact does not exist.
-    pub async fn get_by_id_optional(
-        context: &Context,
-        contact_id: ContactId,
-    ) -> Result<Option<Self>> {
-        if let Some(mut contact) = context
+    /// Loads a contact snapshot from the database.
+    pub async fn load_from_db(context: &Context, contact_id: ContactId) -> Result<Self> {
+        let mut contact = context
            .sql
-            .query_row_optional(
+            .query_row(
                "SELECT c.name, c.addr, c.origin, c.blocked, c.last_seen,
                c.authname, c.param, c.status
               FROM contacts c
@@ -393,27 +371,23 @@ impl Contact {
                    Ok(contact)
                },
            )
-            .await?
-        {
-            if contact_id == ContactId::SELF {
-                contact.name = stock_str::self_msg(context).await;
-                contact.addr = context
-                    .get_config(Config::ConfiguredAddr)
-                    .await?
-                    .unwrap_or_default();
-                contact.status = context
-                    .get_config(Config::Selfstatus)
-                    .await?
-                    .unwrap_or_default();
-            } else if contact_id == ContactId::DEVICE {
-                contact.name = stock_str::device_messages(context).await;
-                contact.addr = ContactId::DEVICE_ADDR.to_string();
-                contact.status = stock_str::device_messages_hint(context).await;
-            }
-            Ok(Some(contact))
-        } else {
-            Ok(None)
+            .await?;
+        if contact_id == ContactId::SELF {
+            contact.name = stock_str::self_msg(context).await;
+            contact.addr = context
+                .get_config(Config::ConfiguredAddr)
+                .await?
+                .unwrap_or_default();
+            contact.status = context
+                .get_config(Config::Selfstatus)
+                .await?
+                .unwrap_or_default();
+        } else if contact_id == ContactId::DEVICE {
+            contact.name = stock_str::device_messages(context).await;
+            contact.addr = ContactId::DEVICE_ADDR.to_string();
+            contact.status = stock_str::device_messages_hint(context).await;
        }
+        Ok(contact)
    }

    /// Returns `true` if this contact is blocked.
@@ -433,13 +407,7 @@ impl Contact {

    /// Check if a contact is blocked.
    pub async fn is_blocked_load(context: &Context, id: ContactId) -> Result<bool> {
-        let blocked = context
-            .sql
-            .query_row("SELECT blocked FROM contacts WHERE id=?", (id,), |row| {
-                let blocked: bool = row.get(0)?;
-                Ok(blocked)
-            })
-            .await?;
+        let blocked = Self::load_from_db(context, id).await?.blocked;
        Ok(blocked)
    }

@@ -991,7 +959,7 @@ impl Contact {
        );

        let mut ret = String::new();
-        if let Ok(contact) = Contact::get_by_id(context, contact_id).await {
+        if let Ok(contact) = Contact::load_from_db(context, contact_id).await {
            let loginparam = LoginParam::load_configured_params(context).await?;
            let peerstate = Peerstate::from_addr(context, &contact.addr).await?;

@@ -1078,6 +1046,17 @@ impl Contact {
        Ok(())
    }

+    /// Get a single contact object.  For a list, see eg. get_contacts().
+    ///
+    /// For contact ContactId::SELF (1), the function returns sth.
+    /// like "Me" in the selected language and the email address
+    /// defined by set_config().
+    pub async fn get_by_id(context: &Context, contact_id: ContactId) -> Result<Contact> {
+        let contact = Contact::load_from_db(context, contact_id).await?;
+
+        Ok(contact)
+    }
+
    /// Updates `param` column in the database.
    pub async fn update_param(&self, context: &Context) -> Result<()> {
        context
@@ -1141,29 +1120,11 @@ impl Contact {
        &self.addr
    }

-    /// Get a summary of authorized name and address.
-    ///
-    /// The returned string is either "Name (email@domain.com)" or just
-    /// "email@domain.com" if the name is unset.
-    ///
-    /// This string is suitable for sending over email
-    /// as it does not leak the locally set name.
-    pub fn get_authname_n_addr(&self) -> String {
-        if !self.authname.is_empty() {
-            format!("{} ({})", self.authname, self.addr)
-        } else {
-            (&self.addr).into()
-        }
-    }
-
    /// Get a summary of name and address.
    ///
    /// The returned string is either "Name (email@domain.com)" or just
    /// "email@domain.com" if the name is unset.
    ///
-    /// The result should only be used locally and never sent over the network
-    /// as it leaks the local contact name.
-    ///
    /// The summary is typically used when asking the user something about the contact.
    /// The attached email address makes the question unique, eg. "Chat with Alan Miller (am@uniquedomain.com)?"
    pub fn get_name_n_addr(&self) -> String {
@@ -1186,7 +1147,7 @@ impl Contact {
            }
        } else if let Some(image_rel) = self.param.get(Param::ProfileImage) {
            if !image_rel.is_empty() {
-                return Ok(Some(get_abs_path(context, Path::new(image_rel))));
+                return Ok(Some(get_abs_path(context, image_rel)));
            }
        }
        Ok(None)
@@ -1356,7 +1317,7 @@ async fn set_block_contact(
        contact_id
    );

-    let contact = Contact::get_by_id(context, contact_id).await?;
+    let contact = Contact::load_from_db(context, contact_id).await?;

    if contact.blocked != new_blocking {
        context
@@ -1418,7 +1379,7 @@ pub(crate) async fn set_profile_image(
    profile_image: &AvatarAction,
    was_encrypted: bool,
 ) -> Result<()> {
-    let mut contact = Contact::get_by_id(context, contact_id).await?;
+    let mut contact = Contact::load_from_db(context, contact_id).await?;
    let changed = match profile_image {
        AvatarAction::Change(profile_image) => {
            if contact_id == ContactId::SELF {
@@ -1473,7 +1434,7 @@ pub(crate) async fn set_status(
                .await?;
        }
    } else {
-        let mut contact = Contact::get_by_id(context, contact_id).await?;
+        let mut contact = Contact::load_from_db(context, contact_id).await?;

        if contact.status != status {
            contact.status = status;
@@ -1732,7 +1693,7 @@ mod tests {
        assert_eq!(may_be_valid_addr("dd.tt"), false);
        assert_eq!(may_be_valid_addr("tt.dd@uu"), true);
        assert_eq!(may_be_valid_addr("u@d"), true);
-        assert_eq!(may_be_valid_addr("u@d."), false);
+        assert_eq!(may_be_valid_addr("u@d."), true);
        assert_eq!(may_be_valid_addr("u@d.t"), true);
        assert_eq!(may_be_valid_addr("u@d.tt"), true);
        assert_eq!(may_be_valid_addr("u@.tt"), true);
@@ -1741,7 +1702,6 @@ mod tests {
        assert_eq!(may_be_valid_addr("sk <@d.tt>"), false);
        assert_eq!(may_be_valid_addr("as@sd.de>"), false);
        assert_eq!(may_be_valid_addr("ask dkl@dd.tt"), false);
-        assert_eq!(may_be_valid_addr("user@domain.tld."), false);
    }

    #[test]
@@ -1792,7 +1752,7 @@ mod tests {
        .await?;
        assert_ne!(id, ContactId::UNDEFINED);

-        let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
+        let contact = Contact::load_from_db(&context.ctx, id).await.unwrap();
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_authname(), "bob");
        assert_eq!(contact.get_display_name(), "bob");
@@ -1820,7 +1780,7 @@ mod tests {
        .await?;
        assert_eq!(contact_bob_id, id);
        assert_eq!(modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
+        let contact = Contact::load_from_db(&context.ctx, id).await.unwrap();
        assert_eq!(contact.get_name(), "someone");
        assert_eq!(contact.get_authname(), "bob");
        assert_eq!(contact.get_display_name(), "someone");
@@ -1886,7 +1846,7 @@ mod tests {
        .unwrap();
        assert!(!contact_id.is_special());
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_id(), contact_id);
        assert_eq!(contact.get_name(), "Name one");
        assert_eq!(contact.get_authname(), "bla foo");
@@ -1905,7 +1865,7 @@ mod tests {
        .unwrap();
        assert_eq!(contact_id, contact_id_test);
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_name(), "Real one");
        assert_eq!(contact.get_addr(), "one@eins.org");
        assert!(!contact.is_blocked());
@@ -1921,7 +1881,7 @@ mod tests {
        .unwrap();
        assert!(!contact_id.is_special());
        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "three@drei.sam");
        assert_eq!(contact.get_addr(), "three@drei.sam");
@@ -1938,7 +1898,7 @@ mod tests {
        .unwrap();
        assert_eq!(contact_id, contact_id_test);
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_name_n_addr(), "m. serious (three@drei.sam)");
        assert!(!contact.is_blocked());

@@ -1953,7 +1913,7 @@ mod tests {
        .unwrap();
        assert_eq!(contact_id, contact_id_test);
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "m. serious");
        assert_eq!(contact.get_name_n_addr(), "schnucki (three@drei.sam)");
        assert!(!contact.is_blocked());
@@ -1969,14 +1929,14 @@ mod tests {
        .unwrap();
        assert!(!contact_id.is_special());
        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_name(), "Wonderland, Alice");
        assert_eq!(contact.get_display_name(), "Wonderland, Alice");
        assert_eq!(contact.get_addr(), "alice@w.de");
        assert_eq!(contact.get_name_n_addr(), "Wonderland, Alice (alice@w.de)");

        // check SELF
-        let contact = Contact::get_by_id(&t, ContactId::SELF).await.unwrap();
+        let contact = Contact::load_from_db(&t, ContactId::SELF).await.unwrap();
        assert_eq!(contact.get_name(), stock_str::self_msg(&t).await);
        assert_eq!(contact.get_addr(), ""); // we're not configured
        assert!(!contact.is_blocked());
@@ -2007,7 +1967,7 @@ mod tests {
        assert_eq!(chatlist.len(), 1);
        let contacts = get_chat_contacts(&t, chat_id).await?;
        let contact_id = contacts.first().unwrap();
-        let contact = Contact::get_by_id(&t, *contact_id).await?;
+        let contact = Contact::load_from_db(&t, *contact_id).await?;
        assert_eq!(contact.get_authname(), "");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "f@example.org");
@@ -2033,7 +1993,7 @@ mod tests {
        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "Flobbyfoo");
        let chatlist = Chatlist::try_load(&t, 0, Some("flobbyfoo"), None).await?;
        assert_eq!(chatlist.len(), 1);
-        let contact = Contact::get_by_id(&t, *contact_id).await?;
+        let contact = Contact::load_from_db(&t, *contact_id).await?;
        assert_eq!(contact.get_authname(), "Flobbyfoo");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "Flobbyfoo");
@@ -2063,7 +2023,7 @@ mod tests {
        assert_eq!(chatlist.len(), 0);
        let chatlist = Chatlist::try_load(&t, 0, Some("Foo Flobby"), None).await?;
        assert_eq!(chatlist.len(), 1);
-        let contact = Contact::get_by_id(&t, *contact_id).await?;
+        let contact = Contact::load_from_db(&t, *contact_id).await?;
        assert_eq!(contact.get_authname(), "Foo Flobby");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "Foo Flobby");
@@ -2081,7 +2041,7 @@ mod tests {
        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "Falk");
        let chatlist = Chatlist::try_load(&t, 0, Some("Falk"), None).await?;
        assert_eq!(chatlist.len(), 1);
-        let contact = Contact::get_by_id(&t, *contact_id).await?;
+        let contact = Contact::load_from_db(&t, *contact_id).await?;
        assert_eq!(contact.get_authname(), "Foo Flobby");
        assert_eq!(contact.get_name(), "Falk");
        assert_eq!(contact.get_display_name(), "Falk");
@@ -2120,7 +2080,7 @@ mod tests {

        // If a contact has ongoing chats, contact is only hidden on deletion
        Contact::delete(&alice, contact_id).await?;
-        let contact = Contact::get_by_id(&alice, contact_id).await?;
+        let contact = Contact::load_from_db(&alice, contact_id).await?;
        assert_eq!(contact.origin, Origin::Hidden);
        assert_eq!(
            Contact::get_all(&alice, 0, Some("bob@example.net"))
@@ -2134,7 +2094,7 @@ mod tests {

        // Can delete contact physically now
        Contact::delete(&alice, contact_id).await?;
-        assert!(Contact::get_by_id(&alice, contact_id).await.is_err());
+        assert!(Contact::load_from_db(&alice, contact_id).await.is_err());
        assert_eq!(
            Contact::get_all(&alice, 0, Some("bob@example.net"))
                .await?
@@ -2153,7 +2113,7 @@ mod tests {
        let contact_id1 = Contact::create(&t, "Foo", "foo@bar.de").await?;
        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
        Contact::delete(&t, contact_id1).await?;
-        assert!(Contact::get_by_id(&t, contact_id1).await.is_err());
+        assert!(Contact::load_from_db(&t, contact_id1).await.is_err());
        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 0);
        let contact_id2 = Contact::create(&t, "Foo", "foo@bar.de").await?;
        assert_ne!(contact_id2, contact_id1);
@@ -2162,12 +2122,12 @@ mod tests {
        // test recreation after hiding
        t.create_chat_with_contact("Foo", "foo@bar.de").await;
        Contact::delete(&t, contact_id2).await?;
-        let contact = Contact::get_by_id(&t, contact_id2).await?;
+        let contact = Contact::load_from_db(&t, contact_id2).await?;
        assert_eq!(contact.origin, Origin::Hidden);
        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 0);

        let contact_id3 = Contact::create(&t, "Foo", "foo@bar.de").await?;
-        let contact = Contact::get_by_id(&t, contact_id3).await?;
+        let contact = Contact::load_from_db(&t, contact_id3).await?;
        assert_eq!(contact.origin, Origin::ManuallyCreated);
        assert_eq!(contact_id3, contact_id2);
        assert_eq!(Contact::get_all(&t, 0, Some("foo@bar.de")).await?.len(), 1);
@@ -2190,7 +2150,7 @@ mod tests {
        .unwrap();
        assert!(!contact_id.is_special());
        assert_eq!(sth_modified, Modifier::Created);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "bob1");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "bob1");
@@ -2206,7 +2166,7 @@ mod tests {
        .unwrap();
        assert!(!contact_id.is_special());
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "bob2");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "bob2");
@@ -2216,7 +2176,7 @@ mod tests {
            .await
            .unwrap();
        assert!(!contact_id.is_special());
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "bob2");
        assert_eq!(contact.get_name(), "bob3");
        assert_eq!(contact.get_display_name(), "bob3");
@@ -2232,7 +2192,7 @@ mod tests {
        .unwrap();
        assert!(!contact_id.is_special());
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "bob4");
        assert_eq!(contact.get_name(), "bob3");
        assert_eq!(contact.get_display_name(), "bob3");
@@ -2245,7 +2205,7 @@ mod tests {
        // manually create "claire@example.org" without a given name
        let contact_id = Contact::create(&t, "", "claire@example.org").await.unwrap();
        assert!(!contact_id.is_special());
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "claire@example.org");
@@ -2261,7 +2221,7 @@ mod tests {
        .unwrap();
        assert_eq!(contact_id, contact_id_same);
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "claire1");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "claire1");
@@ -2277,7 +2237,7 @@ mod tests {
        .unwrap();
        assert_eq!(contact_id, contact_id_same);
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "claire2");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "claire2");
@@ -2300,7 +2260,7 @@ mod tests {
        )
        .await?;
        assert_eq!(sth_modified, Modifier::Created);
-        let contact = Contact::get_by_id(&t, contact_id).await?;
+        let contact = Contact::load_from_db(&t, contact_id).await?;
        assert_eq!(contact.get_display_name(), "Bob");

        // Incoming message from someone else with "Not Bob" <bob@example.org> in the "To:" field.
@@ -2313,7 +2273,7 @@ mod tests {
        .await?;
        assert_eq!(contact_id, contact_id_same);
        assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::get_by_id(&t, contact_id).await?;
+        let contact = Contact::load_from_db(&t, contact_id).await?;
        assert_eq!(contact.get_display_name(), "Not Bob");

        // Incoming message from Bob, changing the name back.
@@ -2326,7 +2286,7 @@ mod tests {
        .await?;
        assert_eq!(contact_id, contact_id_same);
        assert_eq!(sth_modified, Modifier::Modified); // This was None until the bugfix
-        let contact = Contact::get_by_id(&t, contact_id).await?;
+        let contact = Contact::load_from_db(&t, contact_id).await?;
        assert_eq!(contact.get_display_name(), "Bob");

        Ok(())
@@ -2340,7 +2300,7 @@ mod tests {
        let contact_id = Contact::create(&t, "dave1", "dave@example.org")
            .await
            .unwrap();
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "");
        assert_eq!(contact.get_name(), "dave1");
        assert_eq!(contact.get_display_name(), "dave1");
@@ -2354,14 +2314,14 @@ mod tests {
        )
        .await
        .unwrap();
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "dave2");
        assert_eq!(contact.get_name(), "dave1");
        assert_eq!(contact.get_display_name(), "dave1");

        // manually clear the name
        Contact::create(&t, "", "dave@example.org").await.unwrap();
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "dave2");
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_display_name(), "dave2");
@@ -2379,21 +2339,21 @@ mod tests {
        let t = TestContext::new().await;

        let contact_id = Contact::create(&t, "", "<dave@example.org>").await.unwrap();
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_addr(), "dave@example.org");

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

        let contact_id = Contact::create(&t, "name1", "name2 <dave@example.org>")
            .await
            .unwrap();
-        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_name(), "name1");
        assert_eq!(contact.get_addr(), "dave@example.org");

@@ -2637,7 +2597,7 @@ CCCB 5AA9 F6E1 141C 9431
            Origin::ManuallyCreated,
        )
        .await?;
-        let contact = Contact::get_by_id(&alice, contact_id).await?;
+        let contact = Contact::load_from_db(&alice, contact_id).await?;
        assert_eq!(contact.last_seen(), 0);

        let mime = br#"Subject: Hello
@@ -2654,7 +2614,7 @@ Hi."#;

        let timestamp = msg.get_timestamp();
        assert!(timestamp > 0);
-        let contact = Contact::get_by_id(&alice, contact_id).await?;
+        let contact = Contact::load_from_db(&alice, contact_id).await?;
        assert_eq!(contact.last_seen(), timestamp);

        Ok(())
@@ -332,12 +332,6 @@ impl Context {
        }
    }

-    /// Changes encrypted database passphrase.
-    pub async fn change_passphrase(&self, passphrase: String) -> Result<()> {
-        self.sql.change_passphrase(passphrase).await?;
-        Ok(())
-    }
-
    /// Returns true if database is open.
    pub async fn is_open(&self) -> bool {
        self.sql.is_open().await
@@ -1048,7 +1042,7 @@ mod tests {

    async fn receive_msg(t: &TestContext, chat: &Chat) {
        let members = get_chat_contacts(t, chat.id).await.unwrap();
-        let contact = Contact::get_by_id(t, *members.first().unwrap())
+        let contact = Contact::load_from_db(t, *members.first().unwrap())
            .await
            .unwrap();
        let msg = format!(
@@ -1310,11 +1304,11 @@ mod tests {

        // Add messages to chat with Bob.
        let mut msg1 = Message::new(Viewtype::Text);
-        msg1.set_text("foobar".to_string());
+        msg1.set_text(Some("foobar".to_string()));
        send_msg(&alice, chat.id, &mut msg1).await?;

        let mut msg2 = Message::new(Viewtype::Text);
-        msg2.set_text("barbaz".to_string());
+        msg2.set_text(Some("barbaz".to_string()));
        send_msg(&alice, chat.id, &mut msg2).await?;

        // Global search with a part of text finds the message.
@@ -1410,7 +1404,7 @@ mod tests {

        // Add 999 messages
        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("foobar".to_string());
+        msg.set_text(Some("foobar".to_string()));
        for _ in 0..999 {
            send_msg(&alice, chat.id, &mut msg).await?;
        }
@@ -1459,35 +1453,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_context_change_passphrase() -> Result<()> {
-        let dir = tempdir()?;
-        let dbfile = dir.path().join("db.sqlite");
-
-        let id = 1;
-        let context = Context::new_closed(&dbfile, id, Events::new(), StockStrings::new())
-            .await
-            .context("failed to create context")?;
-        assert_eq!(context.open("foo".to_string()).await?, true);
-        assert_eq!(context.is_open().await, true);
-
-        context
-            .set_config(Config::Addr, Some("alice@example.org"))
-            .await?;
-
-        context
-            .change_passphrase("bar".to_string())
-            .await
-            .context("Failed to change passphrase")?;
-
-        assert_eq!(
-            context.get_config(Config::Addr).await?.unwrap(),
-            "alice@example.org"
-        );
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_ongoing() -> Result<()> {
        let context = TestContext::new().await;
@@ -29,30 +29,14 @@ pub fn try_decrypt(
    private_keyring: &Keyring<SignedSecretKey>,
    public_keyring_for_validate: &Keyring<SignedPublicKey>,
 ) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
-    let encrypted_data_part = match {
-        let mime = get_autocrypt_mime(mail);
-        if mime.is_some() {
-            info!(context, "Detected Autocrypt-mime message.");
-        }
-        mime
-    }
-    .or_else(|| {
-        let mime = get_mixed_up_mime(mail);
-        if mime.is_some() {
-            info!(context, "Detected mixed-up mime message.");
-        }
-        mime
-    })
-    .or_else(|| {
-        let mime = get_attachment_mime(mail);
-        if mime.is_some() {
-            info!(context, "Detected attached Autocrypt-mime message.");
-        }
-        mime
-    }) {
+    let encrypted_data_part = match get_autocrypt_mime(mail)
+        .or_else(|| get_mixed_up_mime(mail))
+        .or_else(|| get_attachment_mime(mail))
+    {
        None => return Ok(None),
        Some(res) => res,
    };
+    info!(context, "Detected Autocrypt-mime message");

    decrypt_part(
        encrypted_data_part,
@@ -415,22 +399,8 @@ mod tests {
        let bob = TestContext::new_bob().await;
        receive_imf(&bob, attachment_mime, false).await?;
        let msg = bob.get_last_msg().await;
-        assert_eq!(msg.text, "Hello from Thunderbird!");
+        assert_eq!(msg.text.as_deref(), Some("Hello from Thunderbird!"));

        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_mixed_up_mime_long() -> Result<()> {
-        // Long "mixed-up" mail as received when sending an encrypted message using Delta Chat
-        // Desktop via MS Exchange (actually made with TB though).
-        let mixed_up_mime = include_bytes!("../test-data/message/mixed-up-long.eml");
-        let bob = TestContext::new_bob().await;
-        receive_imf(&bob, mixed_up_mime, false).await?;
-        let msg = bob.get_last_msg().await;
-        assert!(!msg.get_text().is_empty());
-        assert!(msg.has_html());
-        assert!(msg.id.get_html(&bob).await?.unwrap().len() > 40000);
-        Ok(())
-    }
 }
@@ -10,11 +10,10 @@ use quick_xml::{
    Reader,
 };

-use crate::simplify::{simplify_quote, SimplifiedText};
+static LINE_RE: Lazy<regex::Regex> = Lazy::new(|| regex::Regex::new(r"(\r?\n)+").unwrap());

 struct Dehtml {
    strbuilder: String,
-    quote: String,
    add_text: AddText,
    last_href: Option<String>,
    /// GMX wraps a quote in `<div name="quote">`. After a `<div name="quote">`, this count is
@@ -30,22 +29,17 @@ struct Dehtml {
 }

 impl Dehtml {
-    /// Returns true if HTML parser is currently inside the quote.
-    fn is_quote(&self) -> bool {
-        self.divs_since_quoted_content_div > 0 || self.blockquotes_since_blockquote > 0
-    }
-
-    /// Returns the buffer where the text should be written.
-    ///
-    /// If the parser is inside the quote, returns the quote buffer.
-    fn get_buf(&mut self) -> &mut String {
-        if self.is_quote() {
-            &mut self.quote
+    fn line_prefix(&self) -> &str {
+        if self.divs_since_quoted_content_div > 0 || self.blockquotes_since_blockquote > 0 {
+            "> "
        } else {
-            &mut self.strbuilder
+            ""
        }
    }
-
+    fn append_prefix(&self, line_end: &str) -> String {
+        // line_end is e.g. "\n\n". We add "> " if necessary.
+        line_end.to_string() + self.line_prefix()
+    }
    fn get_add_text(&self) -> AddText {
        if self.divs_since_quote_div > 0 && self.divs_since_quoted_content_div == 0 {
            AddText::No // Everything between `<div name="quoted">` and `<div name="quoted_content">` is metadata which we don't want
@@ -57,70 +51,30 @@ impl Dehtml {

 #[derive(Debug, PartialEq, Clone, Copy)]
 enum AddText {
-    /// Inside `<script>`, `<style>` and similar tags
-    /// which contents should not be displayed.
    No,
-
    YesRemoveLineEnds,
-
-    /// Inside `<pre>`.
    YesPreserveLineEnds,
 }

-pub(crate) fn dehtml(buf: &str) -> Option<SimplifiedText> {
-    let (s, quote) = dehtml_quick_xml(buf);
+// dehtml() returns way too many newlines; however, an optimisation on this issue is not needed as
+// the newlines are typically removed in further processing by the caller
+pub fn dehtml(buf: &str) -> Option<String> {
+    let s = dehtml_quick_xml(buf);
    if !s.trim().is_empty() {
-        let text = dehtml_cleanup(s);
-        let top_quote = if !quote.trim().is_empty() {
-            Some(dehtml_cleanup(simplify_quote(&quote).0))
-        } else {
-            None
-        };
-        return Some(SimplifiedText {
-            text,
-            top_quote,
-            ..Default::default()
-        });
+        return Some(s);
    }
    let s = dehtml_manually(buf);
    if !s.trim().is_empty() {
-        let text = dehtml_cleanup(s);
-        return Some(SimplifiedText {
-            text,
-            ..Default::default()
-        });
+        return Some(s);
    }
    None
 }

-fn dehtml_cleanup(mut text: String) -> String {
-    text.retain(|c| c != '\r');
-    let lines = text.trim().split('\n');
-    let mut text = String::new();
-    let mut linebreak = false;
-    for line in lines {
-        if line.chars().all(char::is_whitespace) {
-            linebreak = true;
-        } else {
-            if !text.is_empty() {
-                text += "\n";
-                if linebreak {
-                    text += "\n";
-                }
-            }
-            text += line.trim_end();
-            linebreak = false;
-        }
-    }
-    text
-}
-
-fn dehtml_quick_xml(buf: &str) -> (String, String) {
+fn dehtml_quick_xml(buf: &str) -> String {
    let buf = buf.trim().trim_start_matches("<!doctype html>");

    let mut dehtml = Dehtml {
        strbuilder: String::with_capacity(buf.len()),
-        quote: String::new(),
        add_text: AddText::YesRemoveLineEnds,
        last_href: None,
        divs_since_quote_div: 0,
@@ -172,33 +126,22 @@ fn dehtml_quick_xml(buf: &str) -> (String, String) {
        buf.clear();
    }

-    (dehtml.strbuilder, dehtml.quote)
+    dehtml.strbuilder
 }

 fn dehtml_text_cb(event: &BytesText, dehtml: &mut Dehtml) {
-    static LINE_RE: Lazy<regex::Regex> = Lazy::new(|| regex::Regex::new(r"(\r?\n)+").unwrap());
-
    if dehtml.get_add_text() == AddText::YesPreserveLineEnds
        || dehtml.get_add_text() == AddText::YesRemoveLineEnds
    {
        let last_added = escaper::decode_html_buf_sloppy(event as &[_]).unwrap_or_default();

        if dehtml.get_add_text() == AddText::YesRemoveLineEnds {
-            // Replace all line ends with spaces.
-            // E.g. `\r\n\r\n` is replaced with one space.
-            let last_added = LINE_RE.replace_all(&last_added, " ");
-
-            // Add a space if `last_added` starts with a space
-            // and there is no whitespace at the end of the buffer yet.
-            // Trim the rest of leading whitespace from `last_added`.
-            let buf = dehtml.get_buf();
-            if !buf.ends_with(' ') && !buf.ends_with('\n') && last_added.starts_with(' ') {
-                *buf += " ";
-            }
-
-            *buf += last_added.trim_start();
+            dehtml.strbuilder += LINE_RE.replace_all(&last_added, "\r").as_ref();
+        } else if !dehtml.line_prefix().is_empty() {
+            let l = dehtml.append_prefix("\n");
+            dehtml.strbuilder += LINE_RE.replace_all(&last_added, l.as_str()).as_ref();
        } else {
-            *dehtml.get_buf() += LINE_RE.replace_all(&last_added, "\n").as_ref();
+            dehtml.strbuilder += &last_added;
        }
    }
 }
@@ -210,36 +153,35 @@ fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {

    match tag.as_str() {
        "style" | "script" | "title" | "pre" => {
-            *dehtml.get_buf() += "\n\n";
+            dehtml.strbuilder += &dehtml.append_prefix("\n\n");
            dehtml.add_text = AddText::YesRemoveLineEnds;
        }
        "div" => {
            pop_tag(&mut dehtml.divs_since_quote_div);
            pop_tag(&mut dehtml.divs_since_quoted_content_div);

-            *dehtml.get_buf() += "\n\n";
+            dehtml.strbuilder += &dehtml.append_prefix("\n\n");
            dehtml.add_text = AddText::YesRemoveLineEnds;
        }
        "a" => {
            if let Some(ref last_href) = dehtml.last_href.take() {
-                let buf = dehtml.get_buf();
-                if buf.ends_with('[') {
-                    buf.truncate(buf.len() - 1);
+                if dehtml.strbuilder.ends_with('[') {
+                    dehtml.strbuilder.truncate(dehtml.strbuilder.len() - 1);
                } else {
-                    *buf += "](";
-                    *buf += last_href;
-                    *buf += ")";
+                    dehtml.strbuilder += "](";
+                    dehtml.strbuilder += last_href;
+                    dehtml.strbuilder += ")";
                }
            }
        }
        "b" | "strong" => {
            if dehtml.get_add_text() != AddText::No {
-                *dehtml.get_buf() += "*";
+                dehtml.strbuilder += "*";
            }
        }
        "i" | "em" => {
            if dehtml.get_add_text() != AddText::No {
-                *dehtml.get_buf() += "_";
+                dehtml.strbuilder += "_";
            }
        }
        "blockquote" => pop_tag(&mut dehtml.blockquotes_since_blockquote),
@@ -259,7 +201,7 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
    match tag.as_str() {
        "p" | "table" | "td" => {
            if !dehtml.strbuilder.is_empty() {
-                *dehtml.get_buf() += "\n\n";
+                dehtml.strbuilder += &dehtml.append_prefix("\n\n");
            }
            dehtml.add_text = AddText::YesRemoveLineEnds;
        }
@@ -268,18 +210,18 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
            maybe_push_tag(event, reader, "quote", &mut dehtml.divs_since_quote_div);
            maybe_push_tag(event, reader, "quoted-content", &mut dehtml.divs_since_quoted_content_div);

-            *dehtml.get_buf() += "\n\n";
+            dehtml.strbuilder += &dehtml.append_prefix("\n\n");
            dehtml.add_text = AddText::YesRemoveLineEnds;
        }
        "br" => {
-            *dehtml.get_buf() += "\n";
+            dehtml.strbuilder += &dehtml.append_prefix("\n");
            dehtml.add_text = AddText::YesRemoveLineEnds;
        }
        "style" | "script" | "title" => {
            dehtml.add_text = AddText::No;
        }
        "pre" => {
-            *dehtml.get_buf() += "\n\n";
+            dehtml.strbuilder += &dehtml.append_prefix("\n\n");
            dehtml.add_text = AddText::YesPreserveLineEnds;
        }
        "a" => {
@@ -300,18 +242,18 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(

                if !href.is_empty() {
                    dehtml.last_href = Some(href);
-                    *dehtml.get_buf() += "[";
+                    dehtml.strbuilder += "[";
                }
            }
        }
        "b" | "strong" => {
            if dehtml.get_add_text() != AddText::No {
-                *dehtml.get_buf() += "*";
+                dehtml.strbuilder += "*";
            }
        }
        "i" | "em" => {
            if dehtml.get_add_text() != AddText::No {
-                *dehtml.get_buf() += "_";
+                dehtml.strbuilder += "_";
            }
        }
        "blockquote" => dehtml.blockquotes_since_blockquote += 1,
@@ -372,6 +314,7 @@ pub fn dehtml_manually(buf: &str) -> String {
 #[cfg(test)]
 mod tests {
    use super::*;
+    use crate::simplify::{simplify, SimplifiedText};

    #[test]
    fn test_dehtml() {
@@ -385,18 +328,18 @@ mod tests {
            ("<b> bar <i> foo", "* bar _ foo"),
            ("&amp; bar", "& bar"),
            // Despite missing ', this should be shown:
-            ("<a href='/foo.png>Hi</a> ", "Hi"),
-            ("No link: <a href='https://get.delta.chat/'/>", "No link:"),
+            ("<a href='/foo.png>Hi</a> ", "Hi "),
+            ("No link: <a href='https://get.delta.chat/'/>", "No link: "),
            (
                "No link: <a href='https://get.delta.chat/'></a>",
-                "No link:",
+                "No link: ",
            ),
            ("<!doctype html>\n<b>fat text</b>", "*fat text*"),
            // Invalid html (at least DC should show the text if the html is invalid):
            ("<!some invalid html code>\n<b>some text</b>", "some text"),
        ];
        for (input, output) in cases {
-            assert_eq!(dehtml(input).unwrap().text, output);
+            assert_eq!(simplify(dehtml(input).unwrap(), true).text, output);
        }
        let none_cases = vec!["<html> </html>", ""];
        for input in none_cases {
@@ -406,54 +349,31 @@ mod tests {

    #[test]
    fn test_dehtml_parse_br() {
-        let html = "line1<br>line2";
-        let plain = dehtml(html).unwrap().text;
-        assert_eq!(plain, "line1\nline2");
-
-        let html = "line1<br> line2";
-        let plain = dehtml(html).unwrap().text;
-        assert_eq!(plain, "line1\nline2");
-
-        let html = "line1  <br><br> line2";
-        let plain = dehtml(html).unwrap().text;
-        assert_eq!(plain, "line1\n\nline2");
-
        let html = "\r\r\nline1<br>\r\n\r\n\r\rline2<br/>line3\n\r";
-        let plain = dehtml(html).unwrap().text;
-        assert_eq!(plain, "line1\nline2\nline3");
-    }
+        let plain = dehtml(html).unwrap();

-    #[test]
-    fn test_dehtml_parse_span() {
-        assert_eq!(dehtml("<span>Foo</span>bar").unwrap().text, "Foobar");
-        assert_eq!(dehtml("<span>Foo</span> bar").unwrap().text, "Foo bar");
-        assert_eq!(dehtml("<span>Foo </span>bar").unwrap().text, "Foo bar");
-        assert_eq!(dehtml("<span>Foo</span>\nbar").unwrap().text, "Foo bar");
-        assert_eq!(dehtml("\n<span>Foo</span> bar").unwrap().text, "Foo bar");
-        assert_eq!(dehtml("<span>Foo</span>\n\nbar").unwrap().text, "Foo bar");
-        assert_eq!(dehtml("Foo\n<span>bar</span>").unwrap().text, "Foo bar");
-        assert_eq!(dehtml("Foo<span>\nbar</span>").unwrap().text, "Foo bar");
+        assert_eq!(plain, "line1\n\r\r\rline2\nline3");
    }

    #[test]
    fn test_dehtml_parse_p() {
        let html = "<p>Foo</p><p>Bar</p>";
-        let plain = dehtml(html).unwrap().text;
+        let plain = dehtml(html).unwrap();
        assert_eq!(plain, "Foo\n\nBar");

        let html = "<p>Foo<p>Bar";
-        let plain = dehtml(html).unwrap().text;
+        let plain = dehtml(html).unwrap();
        assert_eq!(plain, "Foo\n\nBar");

        let html = "<p>Foo</p><p>Bar<p>Baz";
-        let plain = dehtml(html).unwrap().text;
+        let plain = dehtml(html).unwrap();
        assert_eq!(plain, "Foo\n\nBar\n\nBaz");
    }

    #[test]
    fn test_dehtml_parse_href() {
        let html = "<a href=url>text</a";
-        let plain = dehtml(html).unwrap().text;
+        let plain = dehtml(html).unwrap();

        assert_eq!(plain, "[text](url)");
    }
@@ -461,7 +381,7 @@ mod tests {
    #[test]
    fn test_dehtml_bold_text() {
        let html = "<!DOCTYPE name [<!DOCTYPE ...>]><!-- comment -->text <b><?php echo ... ?>bold</b><![CDATA[<>]]>";
-        let plain = dehtml(html).unwrap().text;
+        let plain = dehtml(html).unwrap();

        assert_eq!(plain, "text *bold*<>");
    }
@@ -471,7 +391,7 @@ mod tests {
        let html =
                "&lt;&gt;&quot;&apos;&amp; &auml;&Auml;&ouml;&Ouml;&uuml;&Uuml;&szlig; foo&AElig;&ccedil;&Ccedil; &diams;&lrm;&rlm;&zwnj;&noent;&zwj;";

-        let plain = dehtml(html).unwrap().text;
+        let plain = dehtml(html).unwrap();

        assert_eq!(
            plain,
@@ -495,38 +415,32 @@ mod tests {
        </html>
        "##;
        let txt = dehtml(input).unwrap();
-        assert_eq!(txt.text.trim(), "lots of text");
+        assert_eq!(txt.trim(), "lots of text");
    }

    #[test]
    fn test_pre_tag() {
        let input = "<html><pre>\ntwo\nlines\n</pre></html>";
        let txt = dehtml(input).unwrap();
-        assert_eq!(txt.text.trim(), "two\nlines");
+        assert_eq!(txt.trim(), "two\nlines");
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_quote_div() {
        let input = include_str!("../test-data/message/gmx-quote-body.eml");
        let dehtml = dehtml(input).unwrap();
+        println!("{dehtml}");
        let SimplifiedText {
            text,
            is_forwarded,
            is_cut,
            top_quote,
            footer,
-        } = dehtml;
+        } = simplify(dehtml, false);
        assert_eq!(text, "Test");
        assert_eq!(is_forwarded, false);
        assert_eq!(is_cut, false);
        assert_eq!(top_quote.as_deref(), Some("test"));
        assert_eq!(footer, None);
    }
-
-    #[test]
-    fn test_spaces() {
-        let input = include_str!("../test-data/spaces.html");
-        let txt = dehtml(input).unwrap();
-        assert_eq!(txt.text, "Welcome back to Strolling!\n\nHey there,\n\nWelcome back! Use this link to securely sign in to your Strolling account:\n\nSign in to Strolling\n\nFor your security, the link will expire in 24 hours time.\n\nSee you soon!\n\nYou can also copy\n\nhttps://strolling.rosano.ca/members/?token=XXX\n\nIf you did not make this request, you can safely ignore this email.\n\nThis message was sent from [strolling.rosano.ca](https://strolling.rosano.ca/) to [alice@example.org](mailto:alice@example.org)");
-    }
 }
@@ -59,9 +59,6 @@ pub enum DownloadState {
    /// Failed to fully download the message.
    Failure = 20,

-    /// Undecipherable message.
-    Undecipherable = 30,
-
    /// Full download of the message is in progress.
    InProgress = 1000,
 }
@@ -83,9 +80,7 @@ impl MsgId {
    pub async fn download_full(self, context: &Context) -> Result<()> {
        let msg = Message::load_from_db(context, self).await?;
        match msg.download_state() {
-            DownloadState::Done | DownloadState::Undecipherable => {
-                return Err(anyhow!("Nothing to download."))
-            }
+            DownloadState::Done => return Err(anyhow!("Nothing to download.")),
            DownloadState::InProgress => return Err(anyhow!("Download already in progress.")),
            DownloadState::Available | DownloadState::Failure => {
                self.update_download_state(context, DownloadState::InProgress)
@@ -313,7 +308,7 @@ mod tests {
        let chat = t.create_chat_with_contact("Bob", "bob@example.org").await;

        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("Hi Bob".to_owned());
+        msg.set_text(Some("Hi Bob".to_owned()));
        let msg_id = send_msg(&t, chat.id, &mut msg).await?;
        let msg = Message::load_from_db(&t, msg_id).await?;
        assert_eq!(msg.download_state(), DownloadState::Done);
@@ -360,6 +355,7 @@ mod tests {
        assert_eq!(msg.get_subject(), "foo");
        assert!(msg
            .get_text()
+            .unwrap()
            .contains(&stock_str::partial_download_msg_body(&t, 100000).await));

        receive_imf_inner(
@@ -374,7 +370,7 @@ mod tests {
        let msg = t.get_last_msg().await;
        assert_eq!(msg.download_state(), DownloadState::Done);
        assert_eq!(msg.get_subject(), "foo");
-        assert_eq!(msg.get_text(), "100k text...");
+        assert_eq!(msg.get_text(), Some("100k text...".to_string()));

        Ok(())
    }
@@ -219,7 +219,7 @@ impl ChatId {

        if self.is_promoted(context).await? {
            let mut msg = Message::new(Viewtype::Text);
-            msg.text = stock_ephemeral_timer_changed(context, timer, ContactId::SELF).await;
+            msg.text = Some(stock_ephemeral_timer_changed(context, timer, ContactId::SELF).await);
            msg.param.set_cmd(SystemMessage::EphemeralTimerChanged);
            if let Err(err) = send_msg(context, self, &mut msg).await {
                error!(
@@ -1062,14 +1062,14 @@ mod tests {
        delete_expired_messages(t, not_deleted_at).await?;

        let loaded = Message::load_from_db(t, msg_id).await?;
-        assert!(!loaded.text.is_empty());
+        assert_eq!(loaded.text.unwrap(), "Message text");
        assert_eq!(loaded.chat_id, chat.id);

        assert!(next_expiration < deleted_at);
        delete_expired_messages(t, deleted_at).await?;
        t.evtracker
            .get_matching(|evt| {
-                if let EventType::MsgDeleted {
+                if let EventType::MsgsChanged {
                    msg_id: event_msg_id,
                    ..
                } = evt
@@ -1082,6 +1082,7 @@ mod tests {
            .await;

        let loaded = Message::load_from_db(t, msg_id).await?;
+        assert_eq!(loaded.text.unwrap(), "");
        assert_eq!(loaded.chat_id, DC_CHAT_ID_TRASH);

        // Check that the msg was deleted locally.
@@ -1104,7 +1105,7 @@ mod tests {
        if let Ok(msg) = Message::load_from_db(t, msg_id).await {
            assert_eq!(msg.from_id, ContactId::UNDEFINED);
            assert_eq!(msg.to_id, ContactId::UNDEFINED);
-            assert_eq!(msg.text, "");
+            assert!(msg.text.is_none_or_empty(), "{:?}", msg.text);
            let rawtxt: Option<String> = t
                .sql
                .query_get_value("SELECT txt_raw FROM msgs WHERE id=?;", (msg_id,))
@@ -1299,32 +1300,4 @@ mod tests {

        Ok(())
    }
-
-    // Tests that if we are offline for a time longer than the ephemeral timer duration, the message
-    // is deleted from the chat but is still in the "smtp" table, i.e. will be sent upon a
-    // successful reconnection.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_ephemeral_msg_offline() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let chat = alice
-            .create_chat_with_contact("Bob", "bob@example.org")
-            .await;
-        let duration = 60;
-        chat.id
-            .set_ephemeral_timer(&alice, Timer::Enabled { duration })
-            .await?;
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("hi".to_string());
-        assert!(chat::send_msg_sync(&alice, chat.id, &mut msg)
-            .await
-            .is_err());
-        let stmt = "SELECT COUNT(*) FROM smtp WHERE msg_id=?";
-        assert!(alice.sql.exists(stmt, (msg.id,)).await?);
-        let now = time();
-        check_msg_will_be_deleted(&alice, msg.id, &chat, now, now + i64::from(duration) + 1)
-            .await?;
-        assert!(alice.sql.exists(stmt, (msg.id,)).await?);
-
-        Ok(())
-    }
 }
@@ -291,7 +291,7 @@ mod tests {
        let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap();
        assert_eq!(
            parser.html,
-            r#"<!DOCTYPE html>
+            r##"<!DOCTYPE html>
 <html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="color-scheme" content="light dark" />
@@ -299,7 +299,7 @@ mod tests {
 This message does not have Content-Type nor Subject.<br/>
 <br/>
 </body></html>
-"#
+"##
        );
    }

@@ -310,7 +310,7 @@ This message does not have Content-Type nor Subject.<br/>
        let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap();
        assert_eq!(
            parser.html,
-            r#"<!DOCTYPE html>
+            r##"<!DOCTYPE html>
 <html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="color-scheme" content="light dark" />
@@ -318,7 +318,7 @@ This message does not have Content-Type nor Subject.<br/>
 message with a non-UTF-8 encoding: äöüßÄÖÜ<br/>
 <br/>
 </body></html>
-"#
+"##
        );
    }

@@ -330,7 +330,7 @@ message with a non-UTF-8 encoding: äöüßÄÖÜ<br/>
        assert!(parser.plain.unwrap().flowed);
        assert_eq!(
            parser.html,
-            r#"<!DOCTYPE html>
+            r##"<!DOCTYPE html>
 <html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="color-scheme" content="light dark" />
@@ -341,7 +341,7 @@ This line does not end with a space<br/>
 and will be wrapped as usual.<br/>
 <br/>
 </body></html>
-"#
+"##
        );
    }

@@ -352,7 +352,7 @@ and will be wrapped as usual.<br/>
        let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap();
        assert_eq!(
            parser.html,
-            r#"<!DOCTYPE html>
+            r##"<!DOCTYPE html>
 <html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="color-scheme" content="light dark" />
@@ -363,7 +363,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
 <br/>
 <br/>
 </body></html>
-"#
+"##
        );
    }

@@ -456,7 +456,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
        assert_ne!(msg.get_from_id(), ContactId::SELF);
        assert_eq!(msg.is_dc_message, MessengerMessage::No);
        assert!(!msg.is_forwarded());
-        assert!(msg.get_text().contains("this is plain"));
+        assert!(msg.get_text().unwrap().contains("this is plain"));
        assert!(msg.has_html());
        let html = msg.get_id().get_html(&alice).await.unwrap().unwrap();
        assert!(html.contains("this is <b>html</b>"));
@@ -470,7 +470,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
        assert_eq!(msg.get_from_id(), ContactId::SELF);
        assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
        assert!(msg.is_forwarded());
-        assert!(msg.get_text().contains("this is plain"));
+        assert!(msg.get_text().unwrap().contains("this is plain"));
        assert!(msg.has_html());
        let html = msg.get_id().get_html(&alice).await.unwrap().unwrap();
        assert!(html.contains("this is <b>html</b>"));
@@ -483,7 +483,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
        assert_ne!(msg.get_from_id(), ContactId::SELF);
        assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
        assert!(msg.is_forwarded());
-        assert!(msg.get_text().contains("this is plain"));
+        assert!(msg.get_text().unwrap().contains("this is plain"));
        assert!(msg.has_html());
        let html = msg.get_id().get_html(&bob).await.unwrap().unwrap();
        assert!(html.contains("this is <b>html</b>"));
@@ -526,7 +526,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
        assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
        assert!(msg.get_showpadlock());
        assert!(msg.is_forwarded());
-        assert!(msg.get_text().contains("this is plain"));
+        assert!(msg.get_text().unwrap().contains("this is plain"));
        assert!(msg.has_html());
        let html = msg.get_id().get_html(&alice).await.unwrap().unwrap();
        assert!(html.contains("this is <b>html</b>"));
@@ -540,14 +540,14 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
        // alice sends a message with html-part to bob
        let chat_id = alice.create_chat(&bob).await.id;
        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("plain text".to_string());
+        msg.set_text(Some("plain text".to_string()));
        msg.set_html(Some("<b>html</b> text".to_string()));
        assert!(msg.mime_modified);
        chat::send_msg(&alice, chat_id, &mut msg).await.unwrap();

        // check the message is written correctly to alice's db
        let msg = alice.get_last_msg_in(chat_id).await;
-        assert_eq!(msg.get_text(), "plain text");
+        assert_eq!(msg.get_text(), Some("plain text".to_string()));
        assert!(!msg.is_forwarded());
        assert!(msg.mime_modified);
        let html = msg.get_id().get_html(&alice).await.unwrap().unwrap();
@@ -557,7 +557,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
        let chat_id = bob.create_chat(&alice).await.id;
        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
        assert_eq!(msg.chat_id, chat_id);
-        assert_eq!(msg.get_text(), "plain text");
+        assert_eq!(msg.get_text(), Some("plain text".to_string()));
        assert!(!msg.is_forwarded());
        assert!(msg.mime_modified);
        let html = msg.get_id().get_html(&bob).await.unwrap().unwrap();
@@ -575,7 +575,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
        .await?;
        let msg = t.get_last_msg().await;
        assert_eq!(msg.viewtype, Viewtype::Text);
-        assert!(msg.text.contains("foo bar ä ö ü ß"));
+        assert!(msg.text.as_ref().unwrap().contains("foo bar ä ö ü ß"));
        assert!(msg.has_html());
        let html = msg.get_id().get_html(&t).await?.unwrap();
        println!("{html}");
@@ -412,7 +412,7 @@ impl Imap {
                    drop(lock);

                    let mut msg = Message::new(Viewtype::Text);
-                    msg.text = message.clone();
+                    msg.text = Some(message.clone());
                    if let Err(e) =
                        chat::add_device_msg_with_importance(context, None, Some(&mut msg), true)
                            .await
@@ -611,7 +611,8 @@ impl Imap {
                if uid_next < old_uid_next {
                    warn!(
                        context,
-                        "The server illegally decreased the uid_next of folder {folder:?} from {old_uid_next} to {uid_next} without changing validity ({new_uid_validity}), resyncing UIDs...",
+                        "The server illegally decreased the uid_next of folder {} from {} to {} without changing validity ({}), resyncing UIDs...", 
+                        folder, old_uid_next, uid_next, new_uid_validity,
                    );
                    set_uid_next(context, folder, uid_next).await?;
                    job::schedule_resync(context).await?;
@@ -627,7 +628,7 @@ impl Imap {
        set_modseq(context, folder, 0).await?;

        if mailbox.exists == 0 {
-            info!(context, "Folder {folder:?} is empty.");
+            info!(context, "Folder \"{}\" is empty.", folder);

            // set uid_next=1 for empty folders.
            // If we do not do this here, we'll miss the first message
@@ -645,7 +646,7 @@ impl Imap {
            None => {
                warn!(
                    context,
-                    "IMAP folder {folder:?} has no uid_next, fall back to fetching."
+                    "IMAP folder has no uid_next, fall back to fetching"
                );
                // note that we use fetch by sequence number
                // and thus we only need to get exactly the
@@ -684,7 +685,7 @@ impl Imap {
        }
        info!(
            context,
-            "uid/validity change folder {}: new {}/{} previous {}/{}.",
+            "uid/validity change folder {}: new {}/{} previous {}/{}",
            folder,
            new_uid_next,
            new_uid_validity,
@@ -705,17 +706,17 @@ impl Imap {
        fetch_existing_msgs: bool,
    ) -> Result<bool> {
        if should_ignore_folder(context, folder, folder_meaning).await? {
-            info!(context, "Not fetching from {folder:?}.");
+            info!(context, "Not fetching from {}", folder);
            return Ok(false);
        }

        let new_emails = self
            .select_with_uidvalidity(context, folder)
            .await
-            .with_context(|| format!("Failed to select folder {folder:?}"))?;
+            .with_context(|| format!("failed to select folder {folder}"))?;

        if !new_emails && !fetch_existing_msgs {
-            info!(context, "No new emails in folder {folder:?}.");
+            info!(context, "No new emails in folder {}", folder);
            return Ok(false);
        }

@@ -741,56 +742,14 @@ impl Imap {
            let headers = match get_fetch_headers(fetch_response) {
                Ok(headers) => headers,
                Err(err) => {
-                    warn!(context, "Failed to parse FETCH headers: {err:#}.");
+                    warn!(context, "Failed to parse FETCH headers: {}", err);
                    continue;
                }
            };

-            let message_id = prefetch_get_message_id(&headers);
-
-            // Determine the target folder where the message should be moved to.
-            //
-            // If we have seen the message on the IMAP server before, do not move it.
-            // This is required to avoid infinite MOVE loop on IMAP servers
-            // that alias `DeltaChat` folder to other names.
-            // For example, some Dovecot servers alias `DeltaChat` folder to `INBOX.DeltaChat`.
-            // In this case Delta Chat configured with `DeltaChat` as the destination folder
-            // would detect messages in the `INBOX.DeltaChat` folder
-            // and try to move them to the `DeltaChat` folder.
-            // Such move to the same folder results in the messages
-            // getting a new UID, so the messages will be detected as new
-            // in the `INBOX.DeltaChat` folder again.
-            let target = if let Some(message_id) = &message_id {
-                if context
-                    .sql
-                    .exists(
-                        "SELECT COUNT (*) FROM imap WHERE rfc724_mid=?",
-                        (message_id,),
-                    )
-                    .await?
-                {
-                    info!(
-                        context,
-                        "Not moving the message {} that we have seen before.", &message_id
-                    );
-                    folder.to_string()
-                } else {
-                    target_folder(context, folder, folder_meaning, &headers).await?
-                }
-            } else {
-                // Do not move the messages without Message-ID.
-                // We cannot reliably determine if we have seen them before,
-                // so it is safer not to move them.
-                warn!(
-                    context,
-                    "Not moving the message that does not have a Message-ID."
-                );
-                folder.to_string()
-            };
-
-            // Generate a fake Message-ID to identify the message in the database
-            // if the message has no real Message-ID.
-            let message_id = message_id.unwrap_or_else(create_message_id);
+            // Get the Message-ID or generate a fake one to identify the message in the database.
+            let message_id = prefetch_get_or_create_message_id(&headers);
+            let target = target_folder(context, folder, folder_meaning, &headers).await?;

            context
                .sql
@@ -932,7 +891,7 @@ impl Imap {
                if let Some(folder) = context.get_config(config).await? {
                    info!(
                        context,
-                        "Fetching existing messages from folder {folder:?}."
+                        "Fetching existing messages from folder \"{}\"", folder
                    );
                    self.fetch_new_messages(context, &folder, meaning, true)
                        .await
@@ -2101,15 +2060,16 @@ fn get_fetch_headers(prefetch_msg: &Fetch) -> Result<Vec<mailparse::MailHeader>>
    }
 }

-pub(crate) fn prefetch_get_message_id(headers: &[mailparse::MailHeader]) -> Option<String> {
+fn prefetch_get_message_id(headers: &[mailparse::MailHeader]) -> Option<String> {
    headers
        .get_header_value(HeaderDef::XMicrosoftOriginalMessageId)
        .or_else(|| headers.get_header_value(HeaderDef::MessageId))
        .and_then(|msgid| mimeparser::parse_message_id(&msgid).ok())
 }

-pub(crate) fn create_message_id() -> String {
-    format!("{}{}", GENERATED_PREFIX, create_id())
+pub(crate) fn prefetch_get_or_create_message_id(headers: &[mailparse::MailHeader]) -> String {
+    prefetch_get_message_id(headers)
+        .unwrap_or_else(|| format!("{}{}", GENERATED_PREFIX, create_id()))
 }

 /// Returns chat by prefetched headers.
@@ -253,10 +253,12 @@ async fn maybe_add_bcc_self_device_msg(context: &Context) -> Result<()> {
    if !context.sql.get_raw_config_bool("bcc_self").await? {
        let mut msg = Message::new(Viewtype::Text);
        // TODO: define this as a stockstring once the wording is settled.
-        msg.text = "It seems you are using multiple devices with Delta Chat. Great!\n\n\
+        msg.text = Some(
+            "It seems you are using multiple devices with Delta Chat. Great!\n\n\
             If you also want to synchronize outgoing messages across all devices, \
             go to \"Settings → Advanced\" and enable \"Send Copy to Self\"."
-            .to_string();
+                .to_string(),
+        );
        chat::add_device_msg(context, Some("bcc-self-hint"), Some(&mut msg)).await?;
    }
    Ok(())
@@ -586,74 +588,63 @@ async fn export_backup_inner(
    Ok(())
 }

-/// Imports secret key from a file.
-async fn import_secret_key(context: &Context, path: &Path, set_default: bool) -> Result<()> {
-    let buf = read_file(context, &path).await?;
-    let armored = std::string::String::from_utf8_lossy(&buf);
-    set_self_key(context, &armored, set_default, false).await?;
-    Ok(())
-}
-
-/// Imports secret keys from the provided file or directory.
-///
-/// If provided path is a file, ASCII-armored secret key is read from the file
-/// and set as the default key.
-///
-/// If provided path is a directory, all files with .asc extension
-/// containing secret keys are imported and the last successfully
-/// imported which does not contain "legacy" in its filename
-/// is set as the default.
-async fn import_self_keys(context: &Context, path: &Path) -> Result<()> {
-    let attr = tokio::fs::metadata(path).await?;
-
-    if attr.is_file() {
-        info!(
-            context,
-            "Importing secret key from {} as the default key.",
-            path.display()
-        );
-        let set_default = true;
-        import_secret_key(context, path, set_default).await?;
-        return Ok(());
-    }
+/*******************************************************************************
+ * Classic key import
+ ******************************************************************************/
+async fn import_self_keys(context: &Context, dir: &Path) -> Result<()> {
+    /* hint: even if we switch to import Autocrypt Setup Files, we should leave the possibility to import
+    plain ASC keys, at least keys without a password, if we do not want to implement a password entry function.
+    Importing ASC keys is useful to use keys in Delta Chat used by any other non-Autocrypt-PGP implementation.

+    Maybe we should make the "default" key handlong also a little bit smarter
+    (currently, the last imported key is the standard key unless it contains the string "legacy" in its name) */
+    let mut set_default: bool;
    let mut imported_cnt = 0;

-    let mut dir_handle = tokio::fs::read_dir(&path).await?;
+    let dir_name = dir.to_string_lossy();
+    let mut dir_handle = tokio::fs::read_dir(&dir).await?;
    while let Ok(Some(entry)) = dir_handle.next_entry().await {
        let entry_fn = entry.file_name();
        let name_f = entry_fn.to_string_lossy();
-        let path_plus_name = path.join(&entry_fn);
-        if let Some(suffix) = get_filesuffix_lc(&name_f) {
-            if suffix != "asc" {
+        let path_plus_name = dir.join(&entry_fn);
+        match get_filesuffix_lc(&name_f) {
+            Some(suffix) => {
+                if suffix != "asc" {
+                    continue;
+                }
+                set_default = if name_f.contains("legacy") {
+                    info!(context, "found legacy key '{}'", path_plus_name.display());
+                    false
+                } else {
+                    true
+                }
+            }
+            None => {
                continue;
            }
-        } else {
-            continue;
-        };
-        let set_default = !name_f.contains("legacy");
+        }
        info!(
            context,
-            "Considering key file: {}.",
+            "considering key file: {}",
            path_plus_name.display()
        );

-        if let Err(err) = import_secret_key(context, &path_plus_name, set_default).await {
-            warn!(
-                context,
-                "Failed to import secret key from {}: {:#}.",
-                path_plus_name.display(),
-                err
-            );
-            continue;
+        match read_file(context, &path_plus_name).await {
+            Ok(buf) => {
+                let armored = std::string::String::from_utf8_lossy(&buf);
+                if let Err(err) = set_self_key(context, &armored, set_default, false).await {
+                    info!(context, "set_self_key: {}", err);
+                    continue;
+                }
+            }
+            Err(_) => continue,
        }
-
        imported_cnt += 1;
    }
    ensure!(
        imported_cnt > 0,
-        "No private keys found in {}.",
-        path.display()
+        "No private keys found in \"{}\".",
+        dir_name
    );
    Ok(())
 }
@@ -684,8 +675,7 @@ async fn export_self_keys(context: &Context, dir: &Path) -> Result<()> {
        .await?;

    for (id, public_key, private_key, is_default) in keys {
-        let id = Some(id).filter(|_| is_default == 0);
-
+        let id = Some(id).filter(|_| is_default != 0);
        if let Ok(key) = public_key {
            if let Err(err) = export_key_to_asc_file(context, dir, id, &key).await {
                error!(context, "Failed to export public key: {:#}.", err);
@@ -876,35 +866,14 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_export_and_import_key() {
-        let export_dir = tempfile::tempdir().unwrap();
-
        let context = TestContext::new_alice().await;
-        if let Err(err) = imex(
-            &context.ctx,
-            ImexMode::ExportSelfKeys,
-            export_dir.path(),
-            None,
-        )
-        .await
-        {
+        let blobdir = context.ctx.get_blobdir();
+        if let Err(err) = imex(&context.ctx, ImexMode::ExportSelfKeys, blobdir, None).await {
            panic!("got error on export: {err:#}");
        }

        let context2 = TestContext::new_alice().await;
-        if let Err(err) = imex(
-            &context2.ctx,
-            ImexMode::ImportSelfKeys,
-            export_dir.path(),
-            None,
-        )
-        .await
-        {
-            panic!("got error on import: {err:#}");
-        }
-
-        let keyfile = export_dir.path().join("private-key-default.asc");
-        let context3 = TestContext::new_alice().await;
-        if let Err(err) = imex(&context3.ctx, ImexMode::ImportSelfKeys, &keyfile, None).await {
+        if let Err(err) = imex(&context2.ctx, ImexMode::ImportSelfKeys, blobdir, None).await {
            panic!("got error on import: {err:#}");
        }
    }
@@ -1061,7 +1030,10 @@ mod tests {
        // not synchronized yet.
        let sent = alice2.send_text(msg.chat_id, "Test").await;
        alice.recv_msg(&sent).await;
-        assert_ne!(alice.get_last_msg().await.get_text(), "Test");
+        assert_ne!(
+            alice.get_last_msg().await.get_text(),
+            Some("Test".to_string())
+        );

        // Transfer the key.
        continue_key_transfer(&alice2, msg.id, &setup_code).await?;
@@ -1069,7 +1041,10 @@ mod tests {
        // Alice sends a message to self from the new device.
        let sent = alice2.send_text(msg.chat_id, "Test").await;
        alice.recv_msg(&sent).await;
-        assert_eq!(alice.get_last_msg().await.get_text(), "Test");
+        assert_eq!(
+            alice.get_last_msg().await.get_text(),
+            Some("Test".to_string())
+        );

        Ok(())
    }
@@ -275,7 +275,7 @@ impl BackupProvider {
            Ok(_) => {
                context.emit_event(SendProgress::Completed.into());
                let mut msg = Message::new(Viewtype::Text);
-                msg.text = backup_transfer_msg_body(context).await;
+                msg.text = Some(backup_transfer_msg_body(context).await);
                add_device_msg(context, None, Some(&mut msg)).await?;
            }
            Err(err) => {
@@ -611,7 +611,7 @@ mod tests {
        // Write a message in the self chat
        let self_chat = ctx0.get_self_chat().await;
        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("hi there".to_string());
+        msg.set_text(Some("hi there".to_string()));
        send_msg(&ctx0, self_chat.id, &mut msg).await.unwrap();

        // Send an attachment in the self chat
@@ -643,16 +643,14 @@ mod tests {
            _ => panic!("wrong chat item"),
        };
        let msg = Message::load_from_db(&ctx1, *msgid).await.unwrap();
-        let text = msg.get_text();
+        let text = msg.get_text().unwrap();
        assert_eq!(text, "hi there");
        let msgid = match msgs.get(1).unwrap() {
            ChatItem::Message { msg_id } => msg_id,
            _ => panic!("wrong chat item"),
        };
        let msg = Message::load_from_db(&ctx1, *msgid).await.unwrap();
-
        let path = msg.get_file(&ctx1).unwrap();
-        assert_eq!(path.with_file_name("hello.txt"), path);
        let text = fs::read_to_string(&path).await.unwrap();
        assert_eq!(text, "i am attachment");

@@ -155,8 +155,8 @@ impl<'a> Connection<'a> {
 pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_>, mut job: Job) {
    info!(context, "Job {} started...", &job);

-    let try_res = match perform_job_action(context, &job, &mut connection, 0).await {
-        Status::RetryNow => perform_job_action(context, &job, &mut connection, 1).await,
+    let try_res = match perform_job_action(context, &mut job, &mut connection, 0).await {
+        Status::RetryNow => perform_job_action(context, &mut job, &mut connection, 1).await,
        x => x,
    };

@@ -205,7 +205,7 @@ pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_

 async fn perform_job_action(
    context: &Context,
-    job: &Job,
+    job: &mut Job,
    connection: &mut Connection<'_>,
    tries: u32,
 ) -> Status {
@@ -260,7 +260,7 @@ pub(crate) async fn load_keypair(
    })
 }

-/// Use of a key pair for encryption or decryption.
+/// Use of a [KeyPair] for encryption or decryption.
 ///
 /// This is used by [store_self_keypair] to know what kind of key is
 /// being saved.
@@ -44,6 +44,10 @@ where
        self.keys.push(key);
    }

+    pub fn len(&self) -> usize {
+        self.keys.len()
+    }
+
    pub fn is_empty(&self) -> bool {
        self.keys.is_empty()
    }
@@ -79,7 +79,7 @@ pub mod mimeparser;
 pub mod oauth2;
 mod param;
 pub mod peerstate;
-mod pgp;
+pub mod pgp;
 pub mod provider;
 pub mod qr;
 pub mod qr_code_generator;
@@ -280,7 +280,7 @@ pub async fn send_locations_to_chat(
        .await?;
    if 0 != seconds && !is_sending_locations_before {
        let mut msg = Message::new(Viewtype::Text);
-        msg.text = stock_str::msg_location_enabled(context).await;
+        msg.text = Some(stock_str::msg_location_enabled(context).await);
        msg.param.set_cmd(SystemMessage::LocationStreamingEnabled);
        chat::send_msg(context, chat_id, &mut msg)
            .await
@@ -885,7 +885,7 @@ Text message."#,
        )
        .await?;
        let received_msg = alice.get_last_msg().await;
-        assert_eq!(received_msg.text, "Text message.");
+        assert_eq!(received_msg.text.unwrap(), "Text message.");

        receive_imf(
            &alice,
@@ -7,29 +7,29 @@ use anyhow::{ensure, format_err, Context as _, Result};
 use deltachat_derive::{FromSql, ToSql};
 use serde::{Deserialize, Serialize};

-use crate::blob::BlobObject;
-use crate::chat::{Chat, ChatId};
+use crate::chat::{self, Chat, ChatId};
 use crate::config::Config;
 use crate::constants::{
    Blocked, Chattype, VideochatType, DC_CHAT_ID_TRASH, DC_DESIRED_TEXT_LEN, DC_MSG_ID_LAST_SPECIAL,
 };
-use crate::contact::{Contact, ContactId};
+use crate::contact::{Contact, ContactId, Origin};
 use crate::context::Context;
 use crate::debug_logging::set_debug_logging_xdc;
 use crate::download::DownloadState;
 use crate::ephemeral::{start_ephemeral_timers_msgids, Timer as EphemeralTimer};
 use crate::events::EventType;
 use crate::imap::markseen_on_imap_table;
-use crate::mimeparser::{parse_message_id, SystemMessage};
+use crate::mimeparser::{parse_message_id, DeliveryReport, SystemMessage};
 use crate::param::{Param, Params};
 use crate::pgp::split_armored_data;
 use crate::reaction::get_msg_reactions;
 use crate::scheduler::InterruptInfo;
 use crate::sql;
+use crate::stock_str;
 use crate::summary::Summary;
 use crate::tools::{
-    buf_compress, buf_decompress, get_filebytes, get_filemeta, gm2local_offset, read_file, time,
-    timestamp_to_str, truncate,
+    buf_compress, buf_decompress, create_smeared_timestamp, get_filebytes, get_filemeta,
+    gm2local_offset, read_file, time, timestamp_to_str, truncate,
 };

 /// Message ID, including reserved IDs.
@@ -157,171 +157,6 @@ WHERE id=?;
    pub fn to_u32(self) -> u32 {
        self.0
    }
-
-    /// Returns detailed message information in a multi-line text form.
-    pub async fn get_info(self, context: &Context) -> Result<String> {
-        let msg = Message::load_from_db(context, self).await?;
-        let rawtxt: Option<String> = context
-            .sql
-            .query_get_value("SELECT txt_raw FROM msgs WHERE id=?", (self,))
-            .await?;
-
-        let mut ret = String::new();
-
-        if rawtxt.is_none() {
-            ret += &format!("Cannot load message {self}.");
-            return Ok(ret);
-        }
-        let rawtxt = rawtxt.unwrap_or_default();
-        let rawtxt = truncate(rawtxt.trim(), DC_DESIRED_TEXT_LEN);
-
-        let fts = timestamp_to_str(msg.get_timestamp());
-        ret += &format!("Sent: {fts}");
-
-        let name = Contact::get_by_id(context, msg.from_id)
-            .await
-            .map(|contact| contact.get_name_n_addr())
-            .unwrap_or_default();
-
-        ret += &format!(" by {name}");
-        ret += "\n";
-
-        if msg.from_id != ContactId::SELF {
-            let s = timestamp_to_str(if 0 != msg.timestamp_rcvd {
-                msg.timestamp_rcvd
-            } else {
-                msg.timestamp_sort
-            });
-            ret += &format!("Received: {}", &s);
-            ret += "\n";
-        }
-
-        if let EphemeralTimer::Enabled { duration } = msg.ephemeral_timer {
-            ret += &format!("Ephemeral timer: {duration}\n");
-        }
-
-        if msg.ephemeral_timestamp != 0 {
-            ret += &format!("Expires: {}\n", timestamp_to_str(msg.ephemeral_timestamp));
-        }
-
-        if msg.from_id == ContactId::INFO || msg.to_id == ContactId::INFO {
-            // device-internal message, no further details needed
-            return Ok(ret);
-        }
-
-        if let Ok(rows) = context
-            .sql
-            .query_map(
-                "SELECT contact_id, timestamp_sent FROM msgs_mdns WHERE msg_id=?",
-                (self,),
-                |row| {
-                    let contact_id: ContactId = row.get(0)?;
-                    let ts: i64 = row.get(1)?;
-                    Ok((contact_id, ts))
-                },
-                |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
-            )
-            .await
-        {
-            for (contact_id, ts) in rows {
-                let fts = timestamp_to_str(ts);
-                ret += &format!("Read: {fts}");
-
-                let name = Contact::get_by_id(context, contact_id)
-                    .await
-                    .map(|contact| contact.get_name_n_addr())
-                    .unwrap_or_default();
-
-                ret += &format!(" by {name}");
-                ret += "\n";
-            }
-        }
-
-        ret += &format!("State: {}", msg.state);
-
-        if msg.has_location() {
-            ret += ", Location sent";
-        }
-
-        let e2ee_errors = msg.param.get_int(Param::ErroneousE2ee).unwrap_or_default();
-
-        if 0 != e2ee_errors {
-            if 0 != e2ee_errors & 0x2 {
-                ret += ", Encrypted, no valid signature";
-            }
-        } else if 0 != msg.param.get_int(Param::GuaranteeE2ee).unwrap_or_default() {
-            ret += ", Encrypted";
-        }
-
-        ret += "\n";
-
-        let reactions = get_msg_reactions(context, self).await?;
-        if !reactions.is_empty() {
-            ret += &format!("Reactions: {reactions}\n");
-        }
-
-        if let Some(error) = msg.error.as_ref() {
-            ret += &format!("Error: {error}");
-        }
-
-        if let Some(path) = msg.get_file(context) {
-            let bytes = get_filebytes(context, &path).await?;
-            ret += &format!("\nFile: {}, {} bytes\n", path.display(), bytes);
-        }
-
-        if msg.viewtype != Viewtype::Text {
-            ret += "Type: ";
-            ret += &format!("{}", msg.viewtype);
-            ret += "\n";
-            ret += &format!("Mimetype: {}\n", &msg.get_filemime().unwrap_or_default());
-        }
-        let w = msg.param.get_int(Param::Width).unwrap_or_default();
-        let h = msg.param.get_int(Param::Height).unwrap_or_default();
-        if w != 0 || h != 0 {
-            ret += &format!("Dimension: {w} x {h}\n",);
-        }
-        let duration = msg.param.get_int(Param::Duration).unwrap_or_default();
-        if duration != 0 {
-            ret += &format!("Duration: {duration} ms\n",);
-        }
-        if !rawtxt.is_empty() {
-            ret += &format!("\n{rawtxt}\n");
-        }
-        if !msg.rfc724_mid.is_empty() {
-            ret += &format!("\nMessage-ID: {}", msg.rfc724_mid);
-
-            let server_uids = context
-                .sql
-                .query_map(
-                    "SELECT folder, uid FROM imap WHERE rfc724_mid=?",
-                    (msg.rfc724_mid,),
-                    |row| {
-                        let folder: String = row.get("folder")?;
-                        let uid: u32 = row.get("uid")?;
-                        Ok((folder, uid))
-                    },
-                    |rows| {
-                        rows.collect::<std::result::Result<Vec<_>, _>>()
-                            .map_err(Into::into)
-                    },
-                )
-                .await?;
-
-            for (folder, uid) in server_uids {
-                // Format as RFC 5092 relative IMAP URL.
-                ret += &format!("\n</{folder}/;UID={uid}>");
-            }
-        }
-        let hop_info: Option<String> = context
-            .sql
-            .query_get_value("SELECT hop_info FROM msgs WHERE id=?;", (self,))
-            .await?;
-
-        ret += "\n\n";
-        ret += &hop_info.unwrap_or_else(|| "No Hop Info".to_owned());
-
-        Ok(ret)
-    }
 }

 impl std::fmt::Display for MsgId {
@@ -423,7 +258,7 @@ pub struct Message {
    pub(crate) timestamp_rcvd: i64,
    pub(crate) ephemeral_timer: EphemeralTimer,
    pub(crate) ephemeral_timestamp: i64,
-    pub(crate) text: String,
+    pub(crate) text: Option<String>,

    /// Message subject.
    ///
@@ -532,7 +367,7 @@ impl Message {
                            .filter(|error| !error.is_empty()),
                        is_dc_message: row.get("msgrmsg")?,
                        mime_modified: row.get("mime_modified")?,
-                        text,
+                        text: Some(text),
                        subject: row.get("subject")?,
                        param: row.get::<_, String>("param")?.parse().unwrap_or_default(),
                        hidden: row.get("hidden")?,
@@ -544,8 +379,7 @@ impl Message {
                    Ok(msg)
                },
            )
-            .await
-            .with_context(|| format!("failed to load message {id} from the database"))?;
+            .await?;

        Ok(msg)
    }
@@ -583,22 +417,14 @@ impl Message {
                if (self.viewtype == Viewtype::Image || self.viewtype == Viewtype::Gif)
                    && !self.param.exists(Param::Width)
                {
-                    let buf = read_file(context, &path_and_filename).await?;
+                    self.param.set_int(Param::Width, 0);
+                    self.param.set_int(Param::Height, 0);

-                    match get_filemeta(&buf) {
-                        Ok((width, height)) => {
+                    if let Ok(buf) = read_file(context, path_and_filename).await {
+                        if let Ok((width, height)) = get_filemeta(&buf) {
                            self.param.set_int(Param::Width, width as i32);
                            self.param.set_int(Param::Height, height as i32);
                        }
-                        Err(err) => {
-                            self.param.set_int(Param::Width, 0);
-                            self.param.set_int(Param::Height, 0);
-                            warn!(
-                                context,
-                                "Failed to get width and height for {}: {err:#}.",
-                                path_and_filename.display()
-                            );
-                        }
                    }

                    if !self.id.is_unset() {
@@ -688,8 +514,8 @@ impl Message {
    }

    /// Returns the text of the message.
-    pub fn get_text(&self) -> String {
-        self.text.clone()
+    pub fn get_text(&self) -> Option<String> {
+        self.text.as_ref().map(|s| s.to_string())
    }

    /// Returns message subject.
@@ -697,13 +523,11 @@ impl Message {
        &self.subject
    }

-    /// Returns original filename (as shown in chat).
+    /// Returns base file name without the path.
+    /// The base file name includes the extension.
    ///
    /// To get the full path, use [`Self::get_file()`].
    pub fn get_filename(&self) -> Option<String> {
-        if let Some(name) = self.param.get(Param::Filename) {
-            return Some(name.to_string());
-        }
        self.param
            .get(Param::File)
            .and_then(|file| Path::new(file).file_name())
@@ -967,7 +791,7 @@ impl Message {
    }

    /// Sets or unsets message text.
-    pub fn set_text(&mut self, text: String) {
+    pub fn set_text(&mut self, text: Option<String>) {
        self.text = text;
    }

@@ -983,34 +807,20 @@ impl Message {
    /// the file will only be used when the message is prepared
    /// for sending.
    pub fn set_file(&mut self, file: impl ToString, filemime: Option<&str>) {
-        if let Some(name) = Path::new(&file.to_string()).file_name() {
-            if let Some(name) = name.to_str() {
-                self.param.set(Param::Filename, name);
-            }
-        }
        self.param.set(Param::File, file);
-        self.param.set_optional(Param::MimeType, filemime);
-    }
-
-    /// Creates a new blob and sets it as a file associated with a message.
-    pub async fn set_file_from_bytes(
-        &mut self,
-        context: &Context,
-        suggested_name: &str,
-        data: &[u8],
-        filemime: Option<&str>,
-    ) -> Result<()> {
-        let blob = BlobObject::create(context, suggested_name, data).await?;
-        self.param.set(Param::File, blob.as_name());
-        self.param.set_optional(Param::MimeType, filemime);
-        Ok(())
+        if let Some(filemime) = filemime {
+            self.param.set(Param::MimeType, filemime);
+        }
    }

    /// Set different sender name for a message.
    /// This overrides the name set by the `set_config()`-option `displayname`.
    pub fn set_override_sender_name(&mut self, name: Option<String>) {
-        self.param
-            .set_optional(Param::OverrideSenderDisplayname, name);
+        if let Some(name) = name {
+            self.param.set(Param::OverrideSenderDisplayname, name);
+        } else {
+            self.param.remove(Param::OverrideSenderDisplayname);
+        }
    }

    /// Sets the dimensions of associated image or video file.
@@ -1073,7 +883,7 @@ impl Message {
                self.param.set(Param::GuaranteeE2ee, "1");
            }

-            let text = quote.get_text();
+            let text = quote.get_text().unwrap_or_default();
            self.param.set(
                Param::Quote,
                if text.is_empty() {
@@ -1298,6 +1108,171 @@ pub async fn get_msg_read_receipts(
        .await
 }

+/// Returns detailed message information in a multi-line text form.
+pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String> {
+    let msg = Message::load_from_db(context, msg_id).await?;
+    let rawtxt: Option<String> = context
+        .sql
+        .query_get_value("SELECT txt_raw FROM msgs WHERE id=?;", (msg_id,))
+        .await?;
+
+    let mut ret = String::new();
+
+    if rawtxt.is_none() {
+        ret += &format!("Cannot load message {msg_id}.");
+        return Ok(ret);
+    }
+    let rawtxt = rawtxt.unwrap_or_default();
+    let rawtxt = truncate(rawtxt.trim(), DC_DESIRED_TEXT_LEN);
+
+    let fts = timestamp_to_str(msg.get_timestamp());
+    ret += &format!("Sent: {fts}");
+
+    let name = Contact::load_from_db(context, msg.from_id)
+        .await
+        .map(|contact| contact.get_name_n_addr())
+        .unwrap_or_default();
+
+    ret += &format!(" by {name}");
+    ret += "\n";
+
+    if msg.from_id != ContactId::SELF {
+        let s = timestamp_to_str(if 0 != msg.timestamp_rcvd {
+            msg.timestamp_rcvd
+        } else {
+            msg.timestamp_sort
+        });
+        ret += &format!("Received: {}", &s);
+        ret += "\n";
+    }
+
+    if let EphemeralTimer::Enabled { duration } = msg.ephemeral_timer {
+        ret += &format!("Ephemeral timer: {duration}\n");
+    }
+
+    if msg.ephemeral_timestamp != 0 {
+        ret += &format!("Expires: {}\n", timestamp_to_str(msg.ephemeral_timestamp));
+    }
+
+    if msg.from_id == ContactId::INFO || msg.to_id == ContactId::INFO {
+        // device-internal message, no further details needed
+        return Ok(ret);
+    }
+
+    if let Ok(rows) = context
+        .sql
+        .query_map(
+            "SELECT contact_id, timestamp_sent FROM msgs_mdns WHERE msg_id=?;",
+            (msg_id,),
+            |row| {
+                let contact_id: ContactId = row.get(0)?;
+                let ts: i64 = row.get(1)?;
+                Ok((contact_id, ts))
+            },
+            |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
+        )
+        .await
+    {
+        for (contact_id, ts) in rows {
+            let fts = timestamp_to_str(ts);
+            ret += &format!("Read: {fts}");
+
+            let name = Contact::load_from_db(context, contact_id)
+                .await
+                .map(|contact| contact.get_name_n_addr())
+                .unwrap_or_default();
+
+            ret += &format!(" by {name}");
+            ret += "\n";
+        }
+    }
+
+    ret += &format!("State: {}", msg.state);
+
+    if msg.has_location() {
+        ret += ", Location sent";
+    }
+
+    let e2ee_errors = msg.param.get_int(Param::ErroneousE2ee).unwrap_or_default();
+
+    if 0 != e2ee_errors {
+        if 0 != e2ee_errors & 0x2 {
+            ret += ", Encrypted, no valid signature";
+        }
+    } else if 0 != msg.param.get_int(Param::GuaranteeE2ee).unwrap_or_default() {
+        ret += ", Encrypted";
+    }
+
+    ret += "\n";
+
+    let reactions = get_msg_reactions(context, msg_id).await?;
+    if !reactions.is_empty() {
+        ret += &format!("Reactions: {reactions}\n");
+    }
+
+    if let Some(error) = msg.error.as_ref() {
+        ret += &format!("Error: {error}");
+    }
+
+    if let Some(path) = msg.get_file(context) {
+        let bytes = get_filebytes(context, &path).await?;
+        ret += &format!("\nFile: {}, {} bytes\n", path.display(), bytes);
+    }
+
+    if msg.viewtype != Viewtype::Text {
+        ret += "Type: ";
+        ret += &format!("{}", msg.viewtype);
+        ret += "\n";
+        ret += &format!("Mimetype: {}\n", &msg.get_filemime().unwrap_or_default());
+    }
+    let w = msg.param.get_int(Param::Width).unwrap_or_default();
+    let h = msg.param.get_int(Param::Height).unwrap_or_default();
+    if w != 0 || h != 0 {
+        ret += &format!("Dimension: {w} x {h}\n",);
+    }
+    let duration = msg.param.get_int(Param::Duration).unwrap_or_default();
+    if duration != 0 {
+        ret += &format!("Duration: {duration} ms\n",);
+    }
+    if !rawtxt.is_empty() {
+        ret += &format!("\n{rawtxt}\n");
+    }
+    if !msg.rfc724_mid.is_empty() {
+        ret += &format!("\nMessage-ID: {}", msg.rfc724_mid);
+
+        let server_uids = context
+            .sql
+            .query_map(
+                "SELECT folder, uid FROM imap WHERE rfc724_mid=?",
+                (msg.rfc724_mid,),
+                |row| {
+                    let folder: String = row.get("folder")?;
+                    let uid: u32 = row.get("uid")?;
+                    Ok((folder, uid))
+                },
+                |rows| {
+                    rows.collect::<std::result::Result<Vec<_>, _>>()
+                        .map_err(Into::into)
+                },
+            )
+            .await?;
+
+        for (folder, uid) in server_uids {
+            // Format as RFC 5092 relative IMAP URL.
+            ret += &format!("\n</{folder}/;UID={uid}>");
+        }
+    }
+    let hop_info: Option<String> = context
+        .sql
+        .query_get_value("SELECT hop_info FROM msgs WHERE id=?;", (msg_id,))
+        .await?;
+
+    ret += "\n\n";
+    ret += &hop_info.unwrap_or_else(|| "No Hop Info".to_owned());
+
+    Ok(ret)
+}
+
 pub(crate) fn guess_msgtype_from_suffix(path: &Path) -> Option<(Viewtype, &str)> {
    let extension: &str = &path.extension()?.to_str()?.to_lowercase();
    let info = match extension {
@@ -1447,7 +1422,6 @@ pub async fn get_mime_headers(context: &Context, msg_id: MsgId) -> Result<Vec<u8
 /// and scheduling for deletion on IMAP.
 pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
    let mut modified_chat_ids = BTreeSet::new();
-    let mut res = Ok(());

    for &msg_id in msg_ids {
        let msg = Message::load_from_db(context, msg_id).await?;
@@ -1471,19 +1445,13 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
        modified_chat_ids.insert(msg.chat_id);

        let target = context.get_delete_msgs_target().await?;
-        let update_db = |conn: &mut rusqlite::Connection| {
-            conn.execute(
+        context
+            .sql
+            .execute(
                "UPDATE imap SET target=? WHERE rfc724_mid=?",
                (target, msg.rfc724_mid),
-            )?;
-            conn.execute("DELETE FROM smtp WHERE msg_id=?", (msg_id,))?;
-            Ok(())
-        };
-        if let Err(e) = context.sql.call_write(update_db).await {
-            error!(context, "delete_msgs: failed to update db: {e:#}.");
-            res = Err(e);
-            continue;
-        }
+            )
+            .await?;

        let logging_xdc_id = context
            .debug_logging
@@ -1498,7 +1466,6 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
            }
        }
    }
-    res?;

    for modified_chat_id in modified_chat_ids {
        context.emit_msgs_changed(modified_chat_id, MsgId::new(0));
@@ -1667,35 +1634,222 @@ pub(crate) async fn update_msg_state(

 // Context functions to work with messages

-pub(crate) async fn set_msg_failed(
-    context: &Context,
-    msg: &mut Message,
-    error: &str,
-) -> Result<()> {
-    if msg.state.can_fail() {
-        msg.state = MessageState::OutFailed;
-        warn!(context, "{} failed: {}", msg.id, error);
+/// Returns true if given message ID exists in the database and is not trashed.
+pub(crate) async fn exists(context: &Context, msg_id: MsgId) -> Result<bool> {
+    if msg_id.is_special() {
+        return Ok(false);
+    }
+
+    let chat_id: Option<ChatId> = context
+        .sql
+        .query_get_value("SELECT chat_id FROM msgs WHERE id=?;", (msg_id,))
+        .await?;
+
+    if let Some(chat_id) = chat_id {
+        Ok(!chat_id.is_trash())
    } else {
+        Ok(false)
+    }
+}
+
+pub(crate) async fn set_msg_failed(context: &Context, msg_id: MsgId, error: &str) {
+    if let Ok(mut msg) = Message::load_from_db(context, msg_id).await {
+        if msg.state.can_fail() {
+            msg.state = MessageState::OutFailed;
+            warn!(context, "{} failed: {}", msg_id, error);
+        } else {
+            warn!(
+                context,
+                "{} seems to have failed ({}), but state is {}", msg_id, error, msg.state
+            )
+        }
+
+        match context
+            .sql
+            .execute(
+                "UPDATE msgs SET state=?, error=? WHERE id=?;",
+                (msg.state, error, msg_id),
+            )
+            .await
+        {
+            Ok(_) => context.emit_event(EventType::MsgFailed {
+                chat_id: msg.chat_id,
+                msg_id,
+            }),
+            Err(e) => {
+                warn!(context, "{:?}", e);
+            }
+        }
+    }
+}
+
+/// returns Some if an event should be send
+pub async fn handle_mdn(
+    context: &Context,
+    from_id: ContactId,
+    rfc724_mid: &str,
+    timestamp_sent: i64,
+) -> Result<Option<(ChatId, MsgId)>> {
+    if from_id == ContactId::SELF {
        warn!(
            context,
-            "{} seems to have failed ({}), but state is {}", msg.id, error, msg.state
-        )
-    }
-    msg.error = Some(error.to_string());
+            "ignoring MDN sent to self, this is a bug on the sender device"
+        );

-    context
+        // This is not an error on our side,
+        // we successfully ignored an invalid MDN and return `Ok`.
+        return Ok(None);
+    }
+
+    let res = context
        .sql
-        .execute(
-            "UPDATE msgs SET state=?, error=? WHERE id=?;",
-            (msg.state, error, msg.id),
+        .query_row_optional(
+            concat!(
+                "SELECT",
+                "    m.id AS msg_id,",
+                "    c.id AS chat_id,",
+                "    m.state AS state",
+                " FROM msgs m LEFT JOIN chats c ON m.chat_id=c.id",
+                " WHERE rfc724_mid=? AND from_id=1",
+                " ORDER BY m.id;"
+            ),
+            (&rfc724_mid,),
+            |row| {
+                Ok((
+                    row.get::<_, MsgId>("msg_id")?,
+                    row.get::<_, ChatId>("chat_id")?,
+                    row.get::<_, MessageState>("state")?,
+                ))
+            },
        )
        .await?;

-    context.emit_event(EventType::MsgFailed {
-        chat_id: msg.chat_id,
-        msg_id: msg.id,
-    });
+    let (msg_id, chat_id, msg_state) = if let Some(res) = res {
+        res
+    } else {
+        info!(
+            context,
+            "handle_mdn found no message with Message-ID {:?} sent by us in the database",
+            rfc724_mid
+        );
+        return Ok(None);
+    };

+    if !context
+        .sql
+        .exists(
+            "SELECT COUNT(*) FROM msgs_mdns WHERE msg_id=? AND contact_id=?;",
+            (msg_id, from_id),
+        )
+        .await?
+    {
+        context
+            .sql
+            .execute(
+                "INSERT INTO msgs_mdns (msg_id, contact_id, timestamp_sent) VALUES (?, ?, ?);",
+                (msg_id, from_id, timestamp_sent),
+            )
+            .await?;
+    }
+
+    if msg_state == MessageState::OutPreparing
+        || msg_state == MessageState::OutPending
+        || msg_state == MessageState::OutDelivered
+    {
+        update_msg_state(context, msg_id, MessageState::OutMdnRcvd).await?;
+        Ok(Some((chat_id, msg_id)))
+    } else {
+        Ok(None)
+    }
+}
+
+/// Marks a message as failed after an ndn (non-delivery-notification) arrived.
+/// Where appropriate, also adds an info message telling the user which of the recipients of a group message failed.
+pub(crate) async fn handle_ndn(
+    context: &Context,
+    failed: &DeliveryReport,
+    error: Option<String>,
+) -> Result<()> {
+    if failed.rfc724_mid.is_empty() {
+        return Ok(());
+    }
+
+    // The NDN might be for a message-id that had attachments and was sent from a non-Delta Chat client.
+    // In this case we need to mark multiple "msgids" as failed that all refer to the same message-id.
+    let msgs: Vec<_> = context
+        .sql
+        .query_map(
+            concat!(
+                "SELECT",
+                "    m.id AS msg_id,",
+                "    c.id AS chat_id,",
+                "    c.type AS type",
+                " FROM msgs m LEFT JOIN chats c ON m.chat_id=c.id",
+                " WHERE rfc724_mid=? AND from_id=1",
+            ),
+            (&failed.rfc724_mid,),
+            |row| {
+                Ok((
+                    row.get::<_, MsgId>("msg_id")?,
+                    row.get::<_, ChatId>("chat_id")?,
+                    row.get::<_, Chattype>("type")?,
+                ))
+            },
+            |rows| Ok(rows.collect::<Vec<_>>()),
+        )
+        .await?;
+
+    let error = if let Some(error) = error {
+        error
+    } else if let Some(failed_recipient) = &failed.failed_recipient {
+        format!("Delivery to {failed_recipient} failed.").clone()
+    } else {
+        "Delivery to at least one recipient failed.".to_string()
+    };
+
+    let mut first = true;
+    for msg in msgs {
+        let (msg_id, chat_id, chat_type) = msg?;
+        set_msg_failed(context, msg_id, &error).await;
+        if first {
+            // Add only one info msg for all failed messages
+            ndn_maybe_add_info_msg(context, failed, chat_id, chat_type).await?;
+        }
+        first = false;
+    }
+
+    Ok(())
+}
+
+async fn ndn_maybe_add_info_msg(
+    context: &Context,
+    failed: &DeliveryReport,
+    chat_id: ChatId,
+    chat_type: Chattype,
+) -> Result<()> {
+    match chat_type {
+        Chattype::Group | Chattype::Broadcast => {
+            if let Some(failed_recipient) = &failed.failed_recipient {
+                let contact_id =
+                    Contact::lookup_id_by_addr(context, failed_recipient, Origin::Unknown)
+                        .await?
+                        .context("contact ID not found")?;
+                let contact = Contact::load_from_db(context, contact_id).await?;
+                // Tell the user which of the recipients failed if we know that (because in
+                // a group, this might otherwise be unclear)
+                let text = stock_str::failed_sending_to(context, contact.get_display_name()).await;
+                chat::add_info_msg(context, chat_id, &text, create_smeared_timestamp(context))
+                    .await?;
+                context.emit_event(EventType::ChatModified(chat_id));
+            }
+        }
+        Chattype::Mailinglist => {
+            // ndn_maybe_add_info_msg() is about the case when delivery to the group failed.
+            // If we get an NDN for the mailing list, just issue a warning.
+            warn!(context, "ignoring NDN for mailing list.");
+        }
+        Chattype::Single | Chattype::Undefined => {}
+    }
    Ok(())
 }

@@ -1921,7 +2075,7 @@ mod tests {
    use num_traits::FromPrimitive;

    use super::*;
-    use crate::chat::{self, marknoticed_chat, ChatItem};
+    use crate::chat::{marknoticed_chat, ChatItem};
    use crate::chatlist::Chatlist;
    use crate::receive_imf::receive_imf;
    use crate::test_utils as test;
@@ -2097,7 +2251,7 @@ mod tests {
        let chat = d.create_chat_with_contact("", "dest@example.com").await;

        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("Quoted message".to_string());
+        msg.set_text(Some("Quoted message".to_string()));

        // Prepare message for sending, so it gets a Message-Id.
        assert!(msg.rfc724_mid.is_empty());
@@ -2109,14 +2263,14 @@ mod tests {
        msg2.set_quote(ctx, Some(&msg))
            .await
            .expect("can't set quote");
-        assert_eq!(msg2.quoted_text().unwrap(), msg.get_text());
+        assert!(msg2.quoted_text() == msg.get_text());

        let quoted_msg = msg2
            .quoted_message(ctx)
            .await
            .expect("error while retrieving quoted message")
            .expect("quoted message not found");
-        assert_eq!(quoted_msg.get_text(), msg2.quoted_text().unwrap());
+        assert!(quoted_msg.get_text() == msg2.quoted_text());
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -2140,7 +2294,7 @@ mod tests {
        // check chat-id of this message
        let msg = alice.get_last_msg().await;
        assert!(!msg.get_chat_id().is_special());
-        assert_eq!(msg.get_text(), "hello".to_string());
+        assert_eq!(msg.get_text().unwrap(), "hello".to_string());
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -2154,10 +2308,10 @@ mod tests {
            .unwrap()
            .first()
            .unwrap();
-        let contact = Contact::get_by_id(&alice, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&alice, contact_id).await.unwrap();

        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("bla blubb".to_string());
+        msg.set_text(Some("bla blubb".to_string()));
        msg.set_override_sender_name(Some("over ride".to_string()));
        assert_eq!(
            msg.get_override_sender_name(),
@@ -2174,10 +2328,10 @@ mod tests {
            .unwrap()
            .first()
            .unwrap();
-        let contact = Contact::get_by_id(&bob, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&bob, contact_id).await.unwrap();
        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
        assert_eq!(msg.chat_id, chat.id);
-        assert_eq!(msg.text, "bla blubb");
+        assert_eq!(msg.text, Some("bla blubb".to_string()));
        assert_eq!(
            msg.get_override_sender_name(),
            Some("over ride".to_string())
@@ -2197,7 +2351,7 @@ mod tests {
        let bob = TestContext::new_bob().await;
        let alice_chat = alice.create_chat(&bob).await;
        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("this is the text!".to_string());
+        msg.set_text(Some("this is the text!".to_string()));

        // alice sends to bob,
        assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);
@@ -2283,7 +2437,7 @@ mod tests {

        // check outgoing messages states on sender side
        let mut alice_msg = Message::new(Viewtype::Text);
-        alice_msg.set_text("hi!".to_string());
+        alice_msg.set_text(Some("hi!".to_string()));
        assert_eq!(alice_msg.get_state(), MessageState::Undefined); // message not yet in db, assert_state() won't work

        alice_chat
@@ -2303,7 +2457,7 @@ mod tests {
        update_msg_state(&alice, alice_msg.id, MessageState::OutMdnRcvd).await?;
        assert_state(&alice, alice_msg.id, MessageState::OutMdnRcvd).await;

-        set_msg_failed(&alice, &mut alice_msg, "badly failed").await?;
+        set_msg_failed(&alice, alice_msg.id, "badly failed").await;
        assert_state(&alice, alice_msg.id, MessageState::OutFailed).await;

        // check incoming message states on receiver side
@@ -2339,7 +2493,7 @@ mod tests {
        )
        .await?;
        let msg = alice.get_last_msg().await;
-        assert_eq!(msg.get_text(), "hello".to_string());
+        assert_eq!(msg.get_text().unwrap(), "hello".to_string());
        assert!(msg.is_bot());

        // Alice receives a message from Bob who is not the bot anymore.
@@ -2356,7 +2510,7 @@ mod tests {
        )
        .await?;
        let msg = alice.get_last_msg().await;
-        assert_eq!(msg.get_text(), "hello again".to_string());
+        assert_eq!(msg.get_text().unwrap(), "hello again".to_string());
        assert!(!msg.is_bot());

        Ok(())
@@ -2395,13 +2549,13 @@ mod tests {

        let sent = alice.send_text(chat.id, "> First quote").await;
        let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text, "> First quote");
+        assert_eq!(received.text.as_deref(), Some("> First quote"));
        assert!(received.quoted_text().is_none());
        assert!(received.quoted_message(&bob).await?.is_none());

        let sent = alice.send_text(chat.id, "> Second quote").await;
        let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text, "> Second quote");
+        assert_eq!(received.text.as_deref(), Some("> Second quote"));
        assert!(received.quoted_text().is_none());
        assert!(received.quoted_message(&bob).await?.is_none());

@@ -2418,43 +2572,24 @@ mod tests {
        let text = "  Foo bar";
        let sent = alice.send_text(chat.id, text).await;
        let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text, text);
+        assert_eq!(received.text.as_deref(), Some(text));

        let text = "Foo                         bar                                                             baz";
        let sent = alice.send_text(chat.id, text).await;
        let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text, text);
+        assert_eq!(received.text.as_deref(), Some(text));

        let text = "> xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx > A";
        let sent = alice.send_text(chat.id, text).await;
        let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text, text);
+        assert_eq!(received.text.as_deref(), Some(text));

        let python_program = "\
 def hello():
    return 'Hello, world!'";
        let sent = alice.send_text(chat.id, python_program).await;
        let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text, python_program);
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_delete_msgs_offline() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let chat = alice
-            .create_chat_with_contact("Bob", "bob@example.org")
-            .await;
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("hi".to_string());
-        assert!(chat::send_msg_sync(&alice, chat.id, &mut msg)
-            .await
-            .is_err());
-        let stmt = "SELECT COUNT(*) FROM smtp WHERE msg_id=?";
-        assert!(alice.sql.exists(stmt, (msg.id,)).await?);
-        delete_msgs(&alice, &[msg.id]).await?;
-        assert!(!alice.sql.exists(stmt, (msg.id,)).await?);
+        assert_eq!(received.text.as_deref(), Some(python_program));

        Ok(())
    }
@@ -237,7 +237,7 @@ impl<'a> MimeFactory<'a> {
    ) -> Result<MimeFactory<'a>> {
        ensure!(!msg.chat_id.is_special(), "Invalid chat id");

-        let contact = Contact::get_by_id(context, msg.from_id).await?;
+        let contact = Contact::load_from_db(context, msg.from_id).await?;
        let from_addr = context.get_primary_self_addr().await?;
        let from_displayname = context
            .get_config(Config::Displayname)
@@ -918,19 +918,6 @@ impl<'a> MimeFactory<'a> {
            match command {
                SystemMessage::MemberRemovedFromGroup => {
                    let email_to_remove = self.msg.param.get(Param::Arg).unwrap_or_default();
-
-                    if email_to_remove
-                        == context
-                            .get_config(Config::ConfiguredAddr)
-                            .await?
-                            .unwrap_or_default()
-                    {
-                        placeholdertext = Some(stock_str::msg_group_left_remote(context).await);
-                    } else {
-                        placeholdertext =
-                            Some(stock_str::msg_del_member_remote(context, email_to_remove).await);
-                    };
-
                    if !email_to_remove.is_empty() {
                        headers.protected.push(Header::new(
                            "Chat-Group-Member-Removed".into(),
@@ -940,9 +927,6 @@ impl<'a> MimeFactory<'a> {
                }
                SystemMessage::MemberAddedToGroup => {
                    let email_to_add = self.msg.param.get(Param::Arg).unwrap_or_default();
-                    placeholdertext =
-                        Some(stock_str::msg_add_member_remote(context, email_to_add).await);
-
                    if !email_to_add.is_empty() {
                        headers.protected.push(Header::new(
                            "Chat-Group-Member-Added".into(),
@@ -1154,8 +1138,15 @@ impl<'a> MimeFactory<'a> {
        } else {
            None
        };
-
-        let final_text = placeholdertext.as_deref().unwrap_or(&self.msg.text);
+        let final_text = {
+            if let Some(ref text) = placeholdertext {
+                text
+            } else if let Some(ref text) = self.msg.text {
+                text
+            } else {
+                ""
+            }
+        };

        let mut quoted_text = self
            .msg
@@ -1368,7 +1359,7 @@ impl<'a> MimeFactory<'a> {
 ///
 /// This line length limit is an
 /// [RFC5322 requirement](https://tools.ietf.org/html/rfc5322#section-2.1.1).
-pub(crate) fn wrapped_base64_encode(buf: &[u8]) -> String {
+fn wrapped_base64_encode(buf: &[u8]) -> String {
    let base64 = base64::engine::general_purpose::STANDARD.encode(buf);
    let mut chars = base64.chars();
    std::iter::repeat_with(|| chars.by_ref().take(78).collect::<String>())
@@ -1386,7 +1377,7 @@ async fn build_body_file(
        .param
        .get_blob(Param::File, context, true)
        .await?
-        .context("msg has no file")?;
+        .context("msg has no filename")?;
    let suffix = blob.suffix().unwrap_or("dat");

    // Get file name to use for sending.  For privacy purposes, we do
@@ -1431,11 +1422,7 @@ async fn build_body_file(
                ),
            &suffix
        ),
-        _ => msg
-            .param
-            .get(Param::Filename)
-            .unwrap_or_else(|| blob.as_file_name())
-            .to_string(),
+        _ => blob.as_file_name().to_string(),
    };

    /* check mimetype */
@@ -1805,7 +1792,7 @@ mod tests {
            quote: Option<&Message>,
        ) -> Result<String> {
            let mut new_msg = Message::new(Viewtype::Text);
-            new_msg.set_text("Hi".to_string());
+            new_msg.set_text(Some("Hi".to_string()));
            if let Some(q) = quote {
                new_msg.set_quote(t, Some(q)).await?;
            }
@@ -1892,7 +1879,7 @@ mod tests {
        let chat_id = ChatId::create_for_contact(&t, contact_id).await.unwrap();

        let mut new_msg = Message::new(Viewtype::Text);
-        new_msg.set_text("Hi".to_string());
+        new_msg.set_text(Some("Hi".to_string()));
        new_msg.chat_id = chat_id;
        chat::prepare_msg(&t, chat_id, &mut new_msg).await.unwrap();

@@ -2000,7 +1987,7 @@ mod tests {
        chat_id.accept(context).await.unwrap();

        let mut new_msg = Message::new(Viewtype::Text);
-        new_msg.set_text("Hi".to_string());
+        new_msg.set_text(Some("Hi".to_string()));
        new_msg.chat_id = chat_id;
        chat::prepare_msg(context, chat_id, &mut new_msg)
            .await
@@ -2118,7 +2105,7 @@ mod tests {
        // send message to bob: that should get multipart/mixed because of the avatar moved to inner header;
        // make sure, `Subject:` stays in the outer header (imf header)
        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("this is the text!".to_string());
+        msg.set_text(Some("this is the text!".to_string()));

        let sent_msg = t.send_msg(chat.id, &mut msg).await;
        let mut payload = sent_msg.payload().splitn(3, "\r\n\r\n");
@@ -2178,7 +2165,7 @@ mod tests {
        // send message to bob: that should get multipart/mixed because of the avatar moved to inner header;
        // make sure, `Subject:` stays in the outer header (imf header)
        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("this is the text!".to_string());
+        msg.set_text(Some("this is the text!".to_string()));

        let sent_msg = t.send_msg(chat.id, &mut msg).await;
        let mut payload = sent_msg.payload().splitn(4, "\r\n\r\n");
@@ -2209,7 +2196,7 @@ mod tests {
            .await
            .unwrap()
            .unwrap();
-        let alice_contact = Contact::get_by_id(&bob.ctx, alice_id).await.unwrap();
+        let alice_contact = Contact::load_from_db(&bob.ctx, alice_id).await.unwrap();
        assert!(alice_contact
            .get_profile_image(&bob.ctx)
            .await
@@ -2241,7 +2228,7 @@ mod tests {
        assert_eq!(body.match_indices("Subject:").count(), 0);

        bob.recv_msg(&sent_msg).await;
-        let alice_contact = Contact::get_by_id(&bob.ctx, alice_id).await.unwrap();
+        let alice_contact = Contact::load_from_db(&bob.ctx, alice_id).await.unwrap();
        assert!(alice_contact
            .get_profile_image(&bob.ctx)
            .await
@@ -2290,7 +2277,7 @@ mod tests {
        // send message to bob: that should get multipart/mixed because of the avatar moved to inner header;
        // make sure, `Subject:` stays in the outer header (imf header)
        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text("this is the text!".to_string());
+        msg.set_text(Some("this is the text!".to_string()));

        let sent_msg = t.send_msg(chat.id, &mut msg).await;
        let payload = sent_msg.payload();
@@ -2,7 +2,6 @@

 use std::collections::{HashMap, HashSet};
 use std::future::Future;
-use std::path::Path;
 use std::pin::Pin;
 use std::str;

@@ -12,13 +11,13 @@ use deltachat_derive::{FromSql, ToSql};
 use format_flowed::unformat_flowed;
 use lettre_email::mime::{self, Mime};
 use mailparse::{addrparse_header, DispositionType, MailHeader, MailHeaderMap, SingleInfo};
+use once_cell::sync::Lazy;

 use crate::aheader::{Aheader, EncryptPreference};
 use crate::blob::BlobObject;
-use crate::chat::{add_info_msg, ChatId};
 use crate::config::Config;
-use crate::constants::{Chattype, DC_DESIRED_TEXT_LINES, DC_DESIRED_TEXT_LINE_LEN};
-use crate::contact::{addr_cmp, addr_normalize, Contact, ContactId, Origin};
+use crate::constants::{DC_DESIRED_TEXT_LINES, DC_DESIRED_TEXT_LINE_LEN};
+use crate::contact::{addr_cmp, addr_normalize, ContactId};
 use crate::context::Context;
 use crate::decrypt::{
    keyring_from_peerstate, prepare_decryption, try_decrypt, validate_detached_signature,
@@ -29,18 +28,13 @@ use crate::events::EventType;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
 use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
 use crate::keyring::Keyring;
-use crate::message::{
-    self, set_msg_failed, update_msg_state, Message, MessageState, MsgId, Viewtype,
-};
+use crate::message::{self, Viewtype};
 use crate::param::{Param, Params};
 use crate::peerstate::Peerstate;
 use crate::simplify::{simplify, SimplifiedText};
 use crate::stock_str;
 use crate::sync::SyncItems;
-use crate::tools::{
-    create_smeared_timestamp, get_filemeta, parse_receive_headers, strip_rtlo_characters,
-    truncate_by_lines,
-};
+use crate::tools::{get_filemeta, parse_receive_headers, strip_rtlo_characters, truncate_by_lines};
 use crate::{location, tools};

 /// A parsed MIME message.
@@ -438,8 +432,6 @@ impl MimeMessage {
                        typ: Viewtype::Text,
                        msg_raw: Some(txt.clone()),
                        msg: txt,
-                        // Don't change the error prefix for now,
-                        // receive_imf.rs:lookup_chat_by_reply() checks it.
                        error: Some(format!("Decrypting failed: {err:#}")),
                        ..Default::default()
                    };
@@ -647,7 +639,7 @@ impl MimeMessage {
                    .parts
                    .iter_mut()
                    .find(|part| !part.msg.is_empty() && !part.is_reaction);
-                if let Some(part) = part_with_text {
+                if let Some(mut part) = part_with_text {
                    part.msg = format!("{} – {}", subject, part.msg);
                }
            }
@@ -865,7 +857,7 @@ impl MimeMessage {
        is_related: bool,
    ) -> Result<bool> {
        let mut any_part_added = false;
-        let mimetype = get_mime_type(mail, &get_attachment_filename(context, mail)?)?.0;
+        let mimetype = get_mime_type(mail)?.0;
        match (mimetype.type_(), mimetype.subtype().as_str()) {
            /* Most times, multipart/alternative contains true alternatives
            as text/plain and text/html.  If we find a multipart/mixed
@@ -873,9 +865,9 @@ impl MimeMessage {
            apple mail: "plaintext" as an alternative to "html+PDF attachment") */
            (mime::MULTIPART, "alternative") => {
                for cur_data in &mail.subparts {
-                    let mime_type =
-                        get_mime_type(cur_data, &get_attachment_filename(context, cur_data)?)?.0;
-                    if mime_type == "multipart/mixed" || mime_type == "multipart/related" {
+                    if get_mime_type(cur_data)?.0 == "multipart/mixed"
+                        || get_mime_type(cur_data)?.0 == "multipart/related"
+                    {
                        any_part_added = self
                            .parse_mime_recursive(context, cur_data, is_related)
                            .await?;
@@ -885,11 +877,7 @@ impl MimeMessage {
                if !any_part_added {
                    /* search for text/plain and add this */
                    for cur_data in &mail.subparts {
-                        if get_mime_type(cur_data, &get_attachment_filename(context, cur_data)?)?
-                            .0
-                            .type_()
-                            == mime::TEXT
-                        {
+                        if get_mime_type(cur_data)?.0.type_() == mime::TEXT {
                            any_part_added = self
                                .parse_mime_recursive(context, cur_data, is_related)
                                .await?;
@@ -1015,10 +1003,11 @@ impl MimeMessage {
        is_related: bool,
    ) -> Result<bool> {
        // return true if a part was added
-        let filename = get_attachment_filename(context, mail)?;
-        let (mime_type, msg_type) = get_mime_type(mail, &filename)?;
+        let (mime_type, msg_type) = get_mime_type(mail)?;
        let raw_mime = mail.ctype.mimetype.to_lowercase();

+        let filename = get_attachment_filename(context, mail)?;
+
        let old_part_count = self.parts.len();

        match filename {
@@ -1087,20 +1076,16 @@ impl MimeMessage {
                            Default::default()
                        } else {
                            let is_html = mime_type == mime::TEXT_HTML;
-                            if is_html {
+                            let out = if is_html {
                                self.is_mime_modified = true;
-                                if let Some(text) = dehtml(&decoded_data) {
-                                    text
-                                } else {
+                                dehtml(&decoded_data).unwrap_or_else(|| {
                                    dehtml_failed = true;
-                                    SimplifiedText {
-                                        text: decoded_data.clone(),
-                                        ..Default::default()
-                                    }
-                                }
+                                    decoded_data.clone()
+                                })
                            } else {
-                                simplify(decoded_data.clone(), self.has_chat_version())
-                            }
+                                decoded_data.clone()
+                            };
+                            simplify(out, self.has_chat_version())
                        };

                        self.is_mime_modified = self.is_mime_modified
@@ -1275,7 +1260,6 @@ impl MimeMessage {
        part.mimetype = Some(mime_type);
        part.bytes = decoded_data.len();
        part.param.set(Param::File, blob.as_name());
-        part.param.set(Param::Filename, filename);
        part.param.set(Param::MimeType, raw_mime);
        part.is_related = is_related;

@@ -1620,21 +1604,25 @@ impl MimeMessage {
            false
        };
        if maybe_ndn && self.delivery_report.is_none() {
-            for original_message_id in self
+            static RE: Lazy<regex::Regex> =
+                Lazy::new(|| regex::Regex::new(r"Message-ID:(.*)").unwrap());
+            for captures in self
                .parts
                .iter()
                .filter_map(|part| part.msg_raw.as_ref())
                .flat_map(|part| part.lines())
-                .filter_map(|line| line.split_once("Message-ID:"))
-                .filter_map(|(_, message_id)| parse_message_id(message_id).ok())
+                .filter_map(|line| RE.captures(line))
            {
-                if let Ok(Some(_)) = message::rfc724_mid_exists(context, &original_message_id).await
-                {
-                    self.delivery_report = Some(DeliveryReport {
-                        rfc724_mid: original_message_id,
-                        failed_recipient: None,
-                        failure: true,
-                    })
+                if let Ok(original_message_id) = parse_message_id(&captures[1]) {
+                    if let Ok(Some(_)) =
+                        message::rfc724_mid_exists(context, &original_message_id).await
+                    {
+                        self.delivery_report = Some(DeliveryReport {
+                            rfc724_mid: original_message_id,
+                            failed_recipient: None,
+                            failure: true,
+                        })
+                    }
                }
            }
        }
@@ -1656,10 +1644,16 @@ impl MimeMessage {
                .iter()
                .chain(&report.additional_message_ids)
            {
-                if let Err(err) =
-                    handle_mdn(context, from_id, original_message_id, sent_timestamp).await
+                match message::handle_mdn(context, from_id, original_message_id, sent_timestamp)
+                    .await
                {
-                    warn!(context, "Could not handle MDN: {err:#}.");
+                    Ok(Some((chat_id, msg_id))) => {
+                        context.emit_event(EventType::MsgRead { chat_id, msg_id });
+                    }
+                    Ok(None) => {}
+                    Err(err) => {
+                        warn!(context, "failed to handle_mdn: {:#}", err);
+                    }
                }
            }
        }
@@ -1670,8 +1664,8 @@ impl MimeMessage {
                    .iter()
                    .find(|p| p.typ == Viewtype::Text)
                    .map(|p| p.msg.clone());
-                if let Err(err) = handle_ndn(context, delivery_report, error).await {
-                    warn!(context, "Could not handle NDN: {err:#}.");
+                if let Err(e) = message::handle_ndn(context, delivery_report, error).await {
+                    warn!(context, "Could not handle ndn: {}", e);
                }
            }
        }
@@ -1868,10 +1862,7 @@ pub struct Part {
 }

 /// return mimetype and viewtype for a parsed mail
-fn get_mime_type(
-    mail: &mailparse::ParsedMail<'_>,
-    filename: &Option<String>,
-) -> Result<(Mime, Viewtype)> {
+fn get_mime_type(mail: &mailparse::ParsedMail<'_>) -> Result<(Mime, Viewtype)> {
    let mimetype = mail.ctype.mimetype.parse::<Mime>()?;

    let viewtype = match mimetype.type_() {
@@ -1907,16 +1898,7 @@ fn get_mime_type(
                Viewtype::Unknown
            }
        }
-        mime::APPLICATION => match mimetype.subtype() {
-            mime::OCTET_STREAM => match filename {
-                Some(filename) => match message::guess_msgtype_from_suffix(Path::new(&filename)) {
-                    Some((viewtype, _)) => viewtype,
-                    None => Viewtype::File,
-                },
-                None => Viewtype::File,
-            },
-            _ => Viewtype::File,
-        },
+        mime::APPLICATION => Viewtype::File,
        _ => Viewtype::Unknown,
    };

@@ -2041,168 +2023,6 @@ fn get_all_addresses_from_header(
    result
 }

-async fn handle_mdn(
-    context: &Context,
-    from_id: ContactId,
-    rfc724_mid: &str,
-    timestamp_sent: i64,
-) -> Result<()> {
-    if from_id == ContactId::SELF {
-        warn!(
-            context,
-            "Ignoring MDN sent to self, this is a bug on the sender device."
-        );
-
-        // This is not an error on our side,
-        // we successfully ignored an invalid MDN and return `Ok`.
-        return Ok(());
-    }
-
-    let Some((msg_id, chat_id, msg_state)) = context
-        .sql
-        .query_row_optional(
-            concat!(
-                "SELECT",
-                "    m.id AS msg_id,",
-                "    c.id AS chat_id,",
-                "    m.state AS state",
-                " FROM msgs m LEFT JOIN chats c ON m.chat_id=c.id",
-                " WHERE rfc724_mid=? AND from_id=1",
-                " ORDER BY m.id"
-            ),
-            (&rfc724_mid,),
-            |row| {
-                let msg_id: MsgId = row.get("msg_id")?;
-                let chat_id: ChatId = row.get("chat_id")?;
-                let msg_state: MessageState = row.get("state")?;
-                Ok((msg_id, chat_id, msg_state))
-            },
-        )
-        .await?
-    else {
-        info!(
-            context,
-            "Ignoring MDN, found no message with Message-ID {rfc724_mid:?} sent by us in the database.",
-        );
-        return Ok(());
-    };
-
-    if !context
-        .sql
-        .exists(
-            "SELECT COUNT(*) FROM msgs_mdns WHERE msg_id=? AND contact_id=?",
-            (msg_id, from_id),
-        )
-        .await?
-    {
-        context
-            .sql
-            .execute(
-                "INSERT INTO msgs_mdns (msg_id, contact_id, timestamp_sent) VALUES (?, ?, ?)",
-                (msg_id, from_id, timestamp_sent),
-            )
-            .await?;
-    }
-
-    if msg_state == MessageState::OutPreparing
-        || msg_state == MessageState::OutPending
-        || msg_state == MessageState::OutDelivered
-    {
-        update_msg_state(context, msg_id, MessageState::OutMdnRcvd).await?;
-        context.emit_event(EventType::MsgRead { chat_id, msg_id });
-    }
-    Ok(())
-}
-
-/// Marks a message as failed after an ndn (non-delivery-notification) arrived.
-/// Where appropriate, also adds an info message telling the user which of the recipients of a group message failed.
-async fn handle_ndn(
-    context: &Context,
-    failed: &DeliveryReport,
-    error: Option<String>,
-) -> Result<()> {
-    if failed.rfc724_mid.is_empty() {
-        return Ok(());
-    }
-
-    // The NDN might be for a message-id that had attachments and was sent from a non-Delta Chat client.
-    // In this case we need to mark multiple "msgids" as failed that all refer to the same message-id.
-    let msgs: Vec<_> = context
-        .sql
-        .query_map(
-            concat!(
-                "SELECT",
-                "    m.id AS msg_id,",
-                "    c.id AS chat_id,",
-                "    c.type AS type",
-                " FROM msgs m LEFT JOIN chats c ON m.chat_id=c.id",
-                " WHERE rfc724_mid=? AND from_id=1",
-            ),
-            (&failed.rfc724_mid,),
-            |row| {
-                let msg_id: MsgId = row.get("msg_id")?;
-                let chat_id: ChatId = row.get("chat_id")?;
-                let chat_type: Chattype = row.get("type")?;
-                Ok((msg_id, chat_id, chat_type))
-            },
-            |rows| Ok(rows.collect::<Vec<_>>()),
-        )
-        .await?;
-
-    let error = if let Some(error) = error {
-        error
-    } else if let Some(failed_recipient) = &failed.failed_recipient {
-        format!("Delivery to {failed_recipient} failed.").clone()
-    } else {
-        "Delivery to at least one recipient failed.".to_string()
-    };
-
-    let mut first = true;
-    for msg in msgs {
-        let (msg_id, chat_id, chat_type) = msg?;
-        let mut message = Message::load_from_db(context, msg_id).await?;
-        set_msg_failed(context, &mut message, &error).await?;
-        if first {
-            // Add only one info msg for all failed messages
-            ndn_maybe_add_info_msg(context, failed, chat_id, chat_type).await?;
-        }
-        first = false;
-    }
-
-    Ok(())
-}
-
-async fn ndn_maybe_add_info_msg(
-    context: &Context,
-    failed: &DeliveryReport,
-    chat_id: ChatId,
-    chat_type: Chattype,
-) -> Result<()> {
-    match chat_type {
-        Chattype::Group | Chattype::Broadcast => {
-            if let Some(failed_recipient) = &failed.failed_recipient {
-                let contact_id =
-                    Contact::lookup_id_by_addr(context, failed_recipient, Origin::Unknown)
-                        .await?
-                        .context("contact ID not found")?;
-                let contact = Contact::get_by_id(context, contact_id).await?;
-                // Tell the user which of the recipients failed if we know that (because in
-                // a group, this might otherwise be unclear)
-                let text = stock_str::failed_sending_to(context, contact.get_display_name()).await;
-                add_info_msg(context, chat_id, &text, create_smeared_timestamp(context)).await?;
-                context.emit_event(EventType::ChatModified(chat_id));
-            }
-        }
-        Chattype::Mailinglist => {
-            // ndn_maybe_add_info_msg() is about the case when delivery to the group failed.
-            // If we get an NDN for the mailing list, just issue a warning.
-            warn!(context, "ignoring NDN for mailing list.");
-        }
-        Chattype::Single | Chattype::Undefined => {}
-    }
-    Ok(())
-}
-
 #[cfg(test)]
 mod tests {
    #![allow(clippy::indexing_slicing)]
@@ -3107,7 +2927,7 @@ CWt6wx7fiLp0qS9RrX75g6Gqw7nfCs6EcBERcIPt7DTe8VStJwf3LWqVwxl4gQl46yhfoqwEO+I=
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn parse_outlook_html_embedded_image() {
        let context = TestContext::new_alice().await;
-        let raw = br#"From: Anonymous <anonymous@example.org>
+        let raw = br##"From: Anonymous <anonymous@example.org>
 To: Anonymous <anonymous@example.org>
 Subject: Delta Chat is great stuff!
 Date: Tue, 5 May 2020 01:23:45 +0000
@@ -3162,7 +2982,7 @@ K+TuvC7qOah0WLFhcsXWn2+dDV1bXuAeC769TkqkpHhdXfUHnVgK3Pv7u3rVPT5AMeFUGxRB2dP4
 CWt6wx7fiLp0qS9RrX75g6Gqw7nfCs6EcBERcIPt7DTe8VStJwf3LWqVwxl4gQl46yhfoqwEO+I=

 ------=_NextPart_000_0003_01D622B3.CA753E60--
-"#;
+"##;

        let message = MimeMessage::from_bytes(&context.ctx, &raw[..], None)
            .await
@@ -3397,7 +3217,10 @@ On 2020-10-25, Bob wrote:
        let msg_id = chats.get_msg_id(0).unwrap().unwrap();
        let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();

-        assert_eq!(msg.text, "subj with important info – body text");
+        assert_eq!(
+            msg.text.as_ref().unwrap(),
+            "subj with important info – body text"
+        );
        assert_eq!(msg.viewtype, Viewtype::Image);
        assert_eq!(msg.error(), None);
        assert_eq!(msg.is_dc_message, MessengerMessage::No);
@@ -3537,7 +3360,7 @@ On 2020-10-25, Bob wrote:

        // A message with a long Message-ID.
        // Long message-IDs are generated by Mailjet.
-        let raw = br"Date: Thu, 28 Jan 2021 00:26:57 +0000
+        let raw = br###"Date: Thu, 28 Jan 2021 00:26:57 +0000
 Chat-Version: 1.0\n\
 Message-ID: <ABCDEFGH.1234567_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA@mailjet.com>
 To: Bob <bob@example.org>
@@ -3545,11 +3368,11 @@ From: Alice <alice@example.org>
 Subject: ...

 Some quote.
-";
+"###;
        receive_imf(&t, raw, false).await?;

        // Delta Chat generates In-Reply-To with a starting tab when Message-ID is too long.
-        let raw = br"In-Reply-To:
+        let raw = br###"In-Reply-To:
 	<ABCDEFGH.1234567_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA@mailjet.com>
 Date: Thu, 28 Jan 2021 00:26:57 +0000
 Chat-Version: 1.0\n\
@@ -3561,14 +3384,14 @@ Subject: ...
 > Some quote.

 Some reply
-";
+"###;

        receive_imf(&t, raw, false).await?;

        let msg = t.get_last_msg().await;
-        assert_eq!(msg.get_text(), "Some reply");
+        assert_eq!(msg.get_text().unwrap(), "Some reply");
        let quoted_message = msg.quoted_message(&t).await?.unwrap();
-        assert_eq!(quoted_message.get_text(), "Some quote.");
+        assert_eq!(quoted_message.get_text().unwrap(), "Some quote.");

        Ok(())
    }
@@ -3579,7 +3402,7 @@ Some reply
        let alice = TestContext::new_alice().await;
        let bob = TestContext::new_bob().await;

-        let raw = br"Date: Thu, 28 Jan 2021 00:26:57 +0000
+        let raw = br###"Date: Thu, 28 Jan 2021 00:26:57 +0000
 Chat-Version: 1.0\n\
 Message-ID: <foobarbaz@example.org>
 To: Bob <bob@example.org>
@@ -3588,7 +3411,7 @@ Subject: subject
 Chat-Disposition-Notification-To: alice@example.org

 Message.
-";
+"###;

        // Bob receives message.
        receive_imf(&bob, raw, false).await?;
@@ -3772,22 +3595,4 @@ Content-Disposition: reaction\n\

        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_jpeg_as_application_octet_stream() -> Result<()> {
-        let context = TestContext::new_alice().await;
-        let raw = include_bytes!("../test-data/message/jpeg-as-application-octet-stream.eml");
-
-        let msg = MimeMessage::from_bytes(&context.ctx, &raw[..], None)
-            .await
-            .unwrap();
-        assert_eq!(msg.parts.len(), 1);
-        assert_eq!(msg.parts[0].typ, Viewtype::Image);
-
-        receive_imf(&context, &raw[..], false).await?;
-        let msg = context.get_last_msg().await;
-        assert_eq!(msg.get_viewtype(), Viewtype::Image);
-
-        Ok(())
-    }
 }
@@ -21,9 +21,6 @@ pub enum Param {
    /// For messages and jobs
    File = b'f',

-    /// For messages: original filename (as shown in chat)
-    Filename = b'v',
-
    /// For messages: This name should be shown instead of contact.get_display_name()
    /// (used if this is a mailinglist
    /// or explicitly set using set_override_sender_name(), eg. by bots)
@@ -281,16 +278,6 @@ impl Params {
        self
    }

-    /// Sets the given key from an optional value.
-    /// Removes the key if the value is `None`.
-    pub fn set_optional(&mut self, key: Param, value: Option<impl ToString>) -> &mut Self {
-        if let Some(value) = value {
-            self.set(key, value)
-        } else {
-            self.remove(key)
-        }
-    }
-
    /// Check if there are any values in this.
    pub fn is_empty(&self) -> bool {
        self.inner.is_empty()
@@ -541,7 +528,7 @@ mod tests {

        fs::write(fname, b"boo").await.unwrap();
        let blob = p.get_blob(Param::File, &t, true).await.unwrap().unwrap();
-        assert!(blob.as_file_name().starts_with("foo"));
+        assert_eq!(blob, BlobObject::from_name(&t, "foo".to_string()).unwrap());

        // Blob in blobdir, expect blob.
        let bar_path = t.get_blobdir().join("bar");
@@ -535,7 +535,7 @@ impl Peerstate {
                stock_str::contact_setup_changed(context, &self.addr).await
            }
            PeerstateChange::Aeap(new_addr) => {
-                let old_contact = Contact::get_by_id(context, contact_id).await?;
+                let old_contact = Contact::load_from_db(context, contact_id).await?;
                stock_str::aeap_addr_changed(
                    context,
                    old_contact.get_display_name(),
@@ -24,18 +24,11 @@ use crate::keyring::Keyring;
 use crate::tools::EmailAddress;

 #[allow(missing_docs)]
-#[cfg(test)]
-pub(crate) const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt";
+pub const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt";

 #[allow(missing_docs)]
 pub const HEADER_SETUPCODE: &str = "passphrase-begin";

-/// Preferred symmetric encryption algorithm.
-const SYMMETRIC_KEY_ALGORITHM: SymmetricKeyAlgorithm = SymmetricKeyAlgorithm::AES128;
-
-/// Preferred cryptographic hash.
-const HASH_ALGORITHM: HashAlgorithm = HashAlgorithm::SHA2_256;
-
 /// A wrapper for rPGP public key types
 #[derive(Debug)]
 enum SignedPublicKeyOrSubkey<'a> {
@@ -142,7 +135,6 @@ pub struct KeyPair {
 pub(crate) fn create_keypair(addr: EmailAddress, keygen_type: KeyGenType) -> Result<KeyPair> {
    let (secret_key_type, public_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::EdDSA, PgpKeyType::ECDH),
    };

@@ -256,13 +248,11 @@ pub async fn pk_encrypt(
            // TODO: measure time
            let encrypted_msg = if let Some(ref skey) = private_key_for_signing {
                lit_msg
-                    .sign(skey, || "".into(), HASH_ALGORITHM)
+                    .sign(skey, || "".into(), Default::default())
                    .and_then(|msg| msg.compress(CompressionAlgorithm::ZLIB))
-                    .and_then(|msg| {
-                        msg.encrypt_to_keys(&mut rng, SYMMETRIC_KEY_ALGORITHM, &pkeys_refs)
-                    })
+                    .and_then(|msg| msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys_refs))
            } else {
-                lit_msg.encrypt_to_keys(&mut rng, SYMMETRIC_KEY_ALGORITHM, &pkeys_refs)
+                lit_msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys_refs)
            };

            let msg = encrypted_msg?;
@@ -281,7 +271,7 @@ pub fn pk_calc_signature(
    let msg = Message::new_literal_bytes("", plain).sign(
        private_key_for_signing,
        || "".into(),
-        HASH_ALGORITHM,
+        Default::default(),
    )?;
    let signature = msg.into_signature().to_armored_string(None)?;
    Ok(signature)
@@ -378,7 +368,7 @@ pub async fn symm_encrypt(passphrase: &str, plain: &[u8]) -> Result<String> {
        let mut rng = thread_rng();
        let s2k = StringToKey::new_default(&mut rng);
        let msg =
-            lit_msg.encrypt_with_password(&mut rng, s2k, SYMMETRIC_KEY_ALGORITHM, || passphrase)?;
+            lit_msg.encrypt_with_password(&mut rng, s2k, Default::default(), || passphrase)?;

        let encoded_msg = msg.to_armored_string(None)?;

@@ -26,10 +26,10 @@ impl PlainText {
    /// The function handles quotes, links, fixed and floating text paragraphs.
    pub fn to_html(&self) -> String {
        static LINKIFY_MAIL_RE: Lazy<regex::Regex> =
-            Lazy::new(|| regex::Regex::new(r"\b([\w.\-+]+@[\w.\-]+)\b").unwrap());
+            Lazy::new(|| regex::Regex::new(r#"\b([\w.\-+]+@[\w.\-]+)\b"#).unwrap());

        static LINKIFY_URL_RE: Lazy<regex::Regex> = Lazy::new(|| {
-            regex::Regex::new(r"\b((http|https|ftp|ftps):[\w.,:;$/@!?&%\-~=#+]+)").unwrap()
+            regex::Regex::new(r#"\b((http|https|ftp|ftps):[\w.,:;$/@!?&%\-~=#+]+)"#).unwrap()
        });

        let lines = split_lines(&self.text);
@@ -127,7 +127,7 @@ http://link-at-start-of-line.org
        .to_html();
        assert_eq!(
            html,
-            r#"<!DOCTYPE html>
+            r##"<!DOCTYPE html>
 <html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="color-scheme" content="light dark" />
@@ -138,7 +138,7 @@ line with <a href="https://link-mid-of-line.org">https://link-mid-of-line.org</a
 <a href="http://link-at-start-of-line.org">http://link-at-start-of-line.org</a><br/>
 <br/>
 </body></html>
-"#
+"##
        );
    }

@@ -123,10 +123,10 @@ pub struct Provider {
    pub overview_page: &'static str,

    /// List of provider servers.
-    pub server: &'static [Server],
+    pub server: Vec<Server>,

    /// Default configuration values to set when provider is configured.
-    pub config_defaults: Option<&'static [ConfigDefault]>,
+    pub config_defaults: Option<Vec<ConfigDefault>>,

    /// Type of OAuth 2 authorization if provider supports it.
    pub oauth2_authorizer: Option<Oauth2Authorizer>,
@@ -149,8 +149,8 @@ pub struct ProviderOptions {
    pub delete_to_trash: bool,
 }

-impl ProviderOptions {
-    const fn new() -> Self {
+impl Default for ProviderOptions {
+    fn default() -> Self {
        Self {
            strict_tls: true,
            max_smtp_rcpt_to: None,
@@ -223,7 +223,7 @@ pub async fn get_provider_by_mx(context: &Context, domain: &str) -> Option<&'sta
        }

        if let Ok(mx_domains) = resolver.mx_lookup(fqdn).await {
-            for (provider_domain, provider) in &*PROVIDER_DATA {
+            for (provider_domain, provider) in PROVIDER_DATA.iter() {
                if provider.id != "gmail" {
                    // MX lookup is limited to Gmail for security reasons
                    continue;
@@ -71,7 +71,7 @@ async fn get_unique_quota_roots_and_usage(
                // messages could be received and so the usage could have been changed
                *unique_quota_roots
                    .entry(quota_root_name.clone())
-                    .or_default() = quota.resources;
+                    .or_insert_with(Vec::new) = quota.resources;
            }
        }
    }
@@ -156,7 +156,7 @@ impl Context {
                        self.set_config(Config::QuotaExceeding, Some(&highest.to_string()))
                            .await?;
                        let mut msg = Message::new(Viewtype::Text);
-                        msg.text = stock_str::quota_exceeding(self, highest).await;
+                        msg.text = Some(stock_str::quota_exceeding(self, highest).await);
                        add_device_msg_with_importance(self, None, Some(&mut msg), true).await?;
                    } else if highest <= QUOTA_ALLCLEAR_PERCENTAGE {
                        self.set_config(Config::QuotaExceeding, None).await?;
@@ -214,7 +214,7 @@ pub async fn send_reaction(context: &Context, msg_id: MsgId, reaction: &str) ->

    let reaction: Reaction = reaction.into();
    let mut reaction_msg = Message::new(Viewtype::Text);
-    reaction_msg.text = reaction.as_str().to_string();
+    reaction_msg.text = Some(reaction.as_str().to_string());
    reaction_msg.set_reaction();
    reaction_msg.in_reply_to = Some(msg.rfc724_mid);
    reaction_msg.hidden = true;
@@ -74,8 +74,7 @@ pub async fn receive_imf(
    seen: bool,
 ) -> Result<Option<ReceivedMsg>> {
    let mail = parse_mail(imf_raw).context("can't parse mail")?;
-    let rfc724_mid =
-        imap::prefetch_get_message_id(&mail.headers).unwrap_or_else(imap::create_message_id);
+    let rfc724_mid = imap::prefetch_get_or_create_message_id(&mail.headers);
    receive_imf_inner(context, &rfc724_mid, imf_raw, seen, None, false).await
 }

@@ -143,7 +142,7 @@ pub(crate) async fn receive_imf_inner(

    // check, if the mail is already in our database.
    // make sure, this check is done eg. before securejoin-processing.
-    let (replace_partial_download, replace_chat_id) =
+    let replace_partial_download =
        if let Some(old_msg_id) = message::rfc724_mid_exists(context, rfc724_mid).await? {
            let msg = Message::load_from_db(context, old_msg_id).await?;
            if msg.download_state() != DownloadState::Done && is_partial_download.is_none() {
@@ -152,14 +151,14 @@ pub(crate) async fn receive_imf_inner(
                    context,
                    "Message already partly in DB, replacing by full message."
                );
-                (Some(old_msg_id), Some(msg.chat_id))
+                Some(old_msg_id)
            } else {
                // the message was probably moved around.
                info!(context, "Message already in DB, doing nothing.");
                return Ok(None);
            }
        } else {
-            (None, None)
+            None
        };

    let prevent_rename =
@@ -347,8 +346,8 @@ pub(crate) async fn receive_imf_inner(
        }
    }

-    if let Some(replace_chat_id) = replace_chat_id {
-        context.emit_msgs_changed(replace_chat_id, MsgId::new(0));
+    if replace_partial_download.is_some() {
+        context.emit_msgs_changed(chat_id, MsgId::new(0));
    } else if !chat_id.is_trash() {
        let fresh = received_msg.state == MessageState::InFresh;
        for msg_id in &received_msg.msg_ids {
@@ -405,7 +404,7 @@ pub async fn from_field_to_contact_id(
    } else {
        let mut from_id_blocked = false;
        let mut incoming_origin = Origin::Unknown;
-        if let Ok(contact) = Contact::get_by_id(context, from_id).await {
+        if let Ok(contact) = Contact::load_from_db(context, from_id).await {
            from_id_blocked = contact.blocked;
            incoming_origin = contact.origin;
        }
@@ -546,30 +545,19 @@ async fn add_parts(
        // signals whether the current user is a bot
        let is_bot = context.get_config_bool(Config::Bot).await?;

-        let create_blocked_default = if is_bot {
-            Blocked::Not
-        } else {
-            Blocked::Request
-        };
-        let create_blocked = if let Some(ChatIdBlocked { id: _, blocked }) = test_normal_chat {
-            match blocked {
-                Blocked::Request => create_blocked_default,
-                Blocked::Not => Blocked::Not,
-                Blocked::Yes => {
-                    if Contact::is_blocked_load(context, from_id).await? {
-                        // User has blocked the contact.
-                        // Block the group contact created as well.
-                        Blocked::Yes
-                    } else {
-                        // 1:1 chat is blocked, but the contact is not.
-                        // This happens when 1:1 chat is hidden
-                        // during scanning of a group invitation code.
-                        Blocked::Request
-                    }
+        let create_blocked = match test_normal_chat {
+            Some(ChatIdBlocked {
+                id: _,
+                blocked: Blocked::Request,
+            }) if is_bot => Blocked::Not,
+            Some(ChatIdBlocked { id: _, blocked }) => blocked,
+            None => {
+                if is_bot {
+                    Blocked::Not
+                } else {
+                    Blocked::Request
                }
            }
-        } else {
-            create_blocked_default
        };

        if chat_id.is_none() {
@@ -691,7 +679,7 @@ async fn add_parts(
            let create_blocked = if from_id == ContactId::SELF {
                Blocked::Not
            } else {
-                let contact = Contact::get_by_id(context, from_id).await?;
+                let contact = Contact::load_from_db(context, from_id).await?;
                match contact.is_blocked() {
                    true => Blocked::Yes,
                    false if is_bot => Blocked::Not,
@@ -816,7 +804,7 @@ async fn add_parts(
                }
            }
            if chat_id.is_none() && allow_creation {
-                let to_contact = Contact::get_by_id(context, to_id).await?;
+                let to_contact = Contact::load_from_db(context, to_id).await?;
                if let Some(list_id) = to_contact.param.get(Param::ListId) {
                    if let Some((id, _, blocked)) =
                        chat::get_chat_id_by_grpid(context, list_id).await?
@@ -1079,7 +1067,7 @@ async fn add_parts(
    let mut save_mime_modified = mime_parser.is_mime_modified;

    let mime_headers = if save_mime_headers || save_mime_modified {
-        let headers = if !mime_parser.decoded_data.is_empty() {
+        let headers = if mime_parser.was_encrypted() && !mime_parser.decoded_data.is_empty() {
            mime_parser.decoded_data.clone()
        } else {
            imf_raw.to_vec()
@@ -1190,9 +1178,8 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
    mime_compressed=excluded.mime_compressed, mime_in_reply_to=excluded.mime_in_reply_to,
    mime_references=excluded.mime_references, mime_modified=excluded.mime_modified, error=excluded.error, ephemeral_timer=excluded.ephemeral_timer,
    ephemeral_timestamp=excluded.ephemeral_timestamp, download_state=excluded.download_state, hop_info=excluded.hop_info
-RETURNING id
 "#)?;
-                let row_id: MsgId = stmt.query_row(params![
+                stmt.execute(params![
                    replace_msg_id,
                    rfc724_mid,
                    if trash { DC_CHAT_ID_TRASH } else { chat_id },
@@ -1227,18 +1214,12 @@ RETURNING id
                    ephemeral_timestamp,
                    if is_partial_download.is_some() {
                        DownloadState::Available
-                    } else if mime_parser.decrypting_failed {
-                        DownloadState::Undecipherable
                    } else {
                        DownloadState::Done
                    },
                    mime_parser.hop_info
-                ],
-                |row| {
-                    let msg_id: MsgId = row.get(0)?;
-                    Ok(msg_id)
-                }
-                )?;
+                ])?;
+                let row_id = conn.last_insert_rowid();
                Ok(row_id)
            })
            .await?;
@@ -1247,8 +1228,7 @@ RETURNING id
        // afterwards insert additional parts.
        replace_msg_id = None;

-        debug_assert!(!row_id.is_special());
-        created_db_entries.push(row_id);
+        created_db_entries.push(MsgId::new(u32::try_from(row_id)?));
    }

    // check all parts whether they contain a new logging webxdc
@@ -1411,18 +1391,11 @@ async fn lookup_chat_by_reply(
    if let Some(parent) = parent {
        let parent_chat = Chat::load_from_db(context, parent.chat_id).await?;

-        if parent.download_state != DownloadState::Done
-            // TODO (2023-09-12): Added for backward compatibility with versions that did not have
-            // `DownloadState::Undecipherable`. Remove eventually with the comment in
-            // `MimeMessage::from_bytes()`.
-            || parent
-                .error
-                .as_ref()
-                .filter(|e| e.starts_with("Decrypting failed:"))
-                .is_some()
-        {
-            // If the parent msg is not fully downloaded or undecipherable, it may have been
-            // assigned to the wrong chat (they often get assigned to the 1:1 chat with the sender).
+        if parent.error.is_some() {
+            // If the parent msg is undecipherable, then it may have been assigned to the wrong chat
+            // (undecipherable group msgs often get assigned to the 1:1 chat with the sender).
+            // We don't have any way of finding out whether a msg is undecipherable, so we check for
+            // error.is_some() instead.
            return Ok(None);
        }

@@ -1674,48 +1647,41 @@ async fn apply_group_changes(
            false
        };

-    let is_from_in_chat = !chat::is_contact_in_chat(context, chat_id, ContactId::SELF).await?
-        || chat::is_contact_in_chat(context, chat_id, from_id).await?;
-
-    // Reject group membership changes from non-members and old changes.
-    let allow_member_list_changes = is_from_in_chat
-        && chat_id
-            .update_timestamp(context, Param::MemberListTimestamp, sent_timestamp)
-            .await?;
+    // Whether to allow any changes to the member list at all.
+    let allow_member_list_changes =
+        if chat::is_contact_in_chat(context, chat_id, ContactId::SELF).await? || self_added {
+            // Reject old group changes.
+            chat_id
+                .update_timestamp(context, Param::MemberListTimestamp, sent_timestamp)
+                .await?
+        } else {
+            // Member list changes are not allowed if we're not in the group
+            // and are not explicitly added.
+            // This message comes from a Delta Chat that restored an old backup
+            // or the message is a MUA reply to an old message.
+            false
+        };

    // Whether to rebuild the member list from scratch.
-    let recreate_member_list = {
+    let recreate_member_list = if allow_member_list_changes {
        // Recreate member list if the message comes from a MUA as these messages do _not_ set add/remove headers.
-        !mime_parser.has_chat_version()
-            // Always recreate membership list if SELF has been added. The older versions of DC
-            // don't always set "In-Reply-To" to the latest message they sent, but to the latest
-            // delivered message (so it's a race), so we have this heuristic here.
-            || self_added
-            || match mime_parser.get_header(HeaderDef::InReplyTo) {
+        // Always recreate membership list if self has been added.
+        if !mime_parser.has_chat_version() || self_added {
+            true
+        } else {
+            match mime_parser.get_header(HeaderDef::InReplyTo) {
                // If we don't know the referenced message, we missed some messages.
                // Maybe they added/removed members, so we need to recreate our member list.
                Some(reply_to) => rfc724_mid_exists(context, reply_to).await?.is_none(),
                None => false,
            }
-    } && {
-        if !allow_member_list_changes {
-            info!(
-                context,
-                "Ignoring a try to recreate member list of {chat_id} by {from_id}.",
-            );
        }
-        allow_member_list_changes
+    } else {
+        false
    };

    if let Some(removed_addr) = mime_parser.get_header(HeaderDef::ChatGroupMemberRemoved) {
        removed_id = Contact::lookup_id_by_addr(context, removed_addr, Origin::Unknown).await?;
-
-        better_msg = if removed_id == Some(from_id) {
-            Some(stock_str::msg_group_left_local(context, from_id).await)
-        } else {
-            Some(stock_str::msg_del_member_local(context, removed_addr, from_id).await)
-        };
-
        if let Some(contact_id) = removed_id {
            if allow_member_list_changes {
                // Remove a single member from the chat.
@@ -1723,6 +1689,12 @@ async fn apply_group_changes(
                    chat::remove_from_chat_contacts_table(context, chat_id, contact_id).await?;
                    send_event_chat_modified = true;
                }
+
+                better_msg = if contact_id == from_id {
+                    Some(stock_str::msg_group_left(context, from_id).await)
+                } else {
+                    Some(stock_str::msg_del_member(context, removed_addr, from_id).await)
+                };
            } else {
                info!(
                    context,
@@ -1733,8 +1705,6 @@ async fn apply_group_changes(
            warn!(context, "Removed {removed_addr:?} has no contact id.")
        }
    } else if let Some(added_addr) = mime_parser.get_header(HeaderDef::ChatGroupMemberAdded) {
-        better_msg = Some(stock_str::msg_add_member_local(context, added_addr, from_id).await);
-
        if allow_member_list_changes {
            // Add a single member to the chat.
            if !recreate_member_list {
@@ -1747,6 +1717,8 @@ async fn apply_group_changes(
                    warn!(context, "Added {added_addr:?} has no contact id.")
                }
            }
+
+            better_msg = Some(stock_str::msg_add_member(context, added_addr, from_id).await);
        } else {
            info!(context, "Ignoring addition of {added_addr:?} to {chat_id}.");
        }
@@ -1811,35 +1783,43 @@ async fn apply_group_changes(

    // Recreate the member list.
    if recreate_member_list {
-        // Only delete old contacts if the sender is not a classical MUA user:
-        // Classical MUA users usually don't intend to remove users from an email
-        // thread, so if they removed a recipient then it was probably by accident.
-        if mime_parser.has_chat_version() {
-            context
-                .sql
-                .execute("DELETE FROM chats_contacts WHERE chat_id=?;", (chat_id,))
+        if !chat::is_contact_in_chat(context, chat_id, from_id).await? {
+            warn!(
+                context,
+                "Contact {from_id} attempts to modify group chat {chat_id} member list without being a member."
+            );
+        } else {
+            // Only delete old contacts if the sender is not a classical MUA user:
+            // Classical MUA users usually don't intend to remove users from an email
+            // thread, so if they removed a recipient then it was probably by accident.
+            if mime_parser.has_chat_version() {
+                context
+                    .sql
+                    .execute("DELETE FROM chats_contacts WHERE chat_id=?;", (chat_id,))
+                    .await?;
+            }
+
+            let mut members_to_add = HashSet::new();
+            members_to_add.extend(to_ids);
+            members_to_add.insert(ContactId::SELF);
+
+            if !from_id.is_special() {
+                members_to_add.insert(from_id);
+            }
+
+            if let Some(removed_id) = removed_id {
+                members_to_add.remove(&removed_id);
+            }
+
+            info!(
+                context,
+                "Recreating chat {chat_id} with members {members_to_add:?}."
+            );
+
+            chat::add_to_chat_contacts_table(context, chat_id, &Vec::from_iter(members_to_add))
                .await?;
+            send_event_chat_modified = true;
        }
-
-        let mut members_to_add = HashSet::new();
-        members_to_add.extend(to_ids);
-        members_to_add.insert(ContactId::SELF);
-
-        if !from_id.is_special() {
-            members_to_add.insert(from_id);
-        }
-
-        if let Some(removed_id) = removed_id {
-            members_to_add.remove(&removed_id);
-        }
-
-        info!(
-            context,
-            "Recreating chat {chat_id} with members {members_to_add:?}."
-        );
-
-        chat::add_to_chat_contacts_table(context, chat_id, &Vec::from_iter(members_to_add)).await?;
-        send_event_chat_modified = true;
    }

    if let Some(avatar_action) = &mime_parser.group_avatar {
@@ -2025,7 +2005,7 @@ async fn apply_mailinglist_changes(
        };
        let (contact_id, _) =
            Contact::add_or_lookup(context, "", list_post, Origin::Hidden).await?;
-        let mut contact = Contact::get_by_id(context, contact_id).await?;
+        let mut contact = Contact::load_from_db(context, contact_id).await?;
        if contact.param.get(Param::ListId) != Some(listid) {
            contact.param.set(Param::ListId, listid);
            contact.update_param(context).await?;
@@ -2143,7 +2123,7 @@ async fn check_verified_properties(
    from_id: ContactId,
    to_ids: &[ContactId],
 ) -> Result<()> {
-    let contact = Contact::get_by_id(context, from_id).await?;
+    let contact = Contact::load_from_db(context, from_id).await?;

    ensure!(mimeparser.was_encrypted(), "This message is not encrypted");

@@ -2357,7 +2337,7 @@ async fn add_or_lookup_contacts_by_address_list(
    origin: Origin,
 ) -> Result<Vec<ContactId>> {
    let mut contact_ids = HashSet::new();
-    for info in address_list {
+    for info in address_list.iter() {
        let addr = &info.addr;
        if !may_be_valid_addr(addr) {
            continue;
@@ -8,8 +8,7 @@ use crate::chat::{
 };
 use crate::chat::{get_chat_msgs, ChatItem, ChatVisibility};
 use crate::chatlist::Chatlist;
-use crate::config::Config;
-use crate::constants::{DC_GCL_FOR_FORWARDING, DC_GCL_NO_SPECIALS};
+use crate::constants::DC_GCL_NO_SPECIALS;
 use crate::imap::prefetch_should_download;
 use crate::message::Message;
 use crate::test_utils::{get_chat_msg, TestContext, TestContextManager};
@@ -251,7 +250,7 @@ async fn test_read_receipt_and_unarchive() -> Result<()> {
    .await?;
    let msg = get_chat_msg(&t, group_id, 0, 1).await;
    assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
-    assert_eq!(msg.text, "hello");
+    assert_eq!(msg.text.unwrap(), "hello");
    assert_eq!(msg.state, MessageState::OutDelivered);
    let group = Chat::load_from_db(&t, group_id).await?;
    assert!(group.get_visibility() == ChatVisibility::Normal);
@@ -408,7 +407,7 @@ async fn test_escaped_from() {
            false,
        ).await.unwrap();
    assert_eq!(
-        Contact::get_by_id(&t, contact_id)
+        Contact::load_from_db(&t, contact_id)
            .await
            .unwrap()
            .get_authname(),
@@ -416,7 +415,7 @@ async fn test_escaped_from() {
    );
    let msg = get_chat_msg(&t, chat_id, 0, 1).await;
    assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
-    assert_eq!(msg.text, "hello");
+    assert_eq!(msg.text.unwrap(), "hello");
    assert_eq!(msg.param.get_int(Param::WantsMdn).unwrap(), 1);
 }

@@ -453,7 +452,7 @@ async fn test_escaped_recipients() {
    )
    .await
    .unwrap();
-    let contact = Contact::get_by_id(&t, carl_contact_id).await.unwrap();
+    let contact = Contact::load_from_db(&t, carl_contact_id).await.unwrap();
    assert_eq!(contact.get_name(), "");
    assert_eq!(contact.get_display_name(), "h2");

@@ -462,7 +461,7 @@ async fn test_escaped_recipients() {
        .await
        .unwrap();
    assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
-    assert_eq!(msg.text, "hello");
+    assert_eq!(msg.text.unwrap(), "hello");
    assert_eq!(msg.param.get_int(Param::WantsMdn).unwrap(), 1);
 }

@@ -500,7 +499,7 @@ async fn test_cc_to_contact() {
    )
    .await
    .unwrap();
-    let contact = Contact::get_by_id(&t, carl_contact_id).await.unwrap();
+    let contact = Contact::load_from_db(&t, carl_contact_id).await.unwrap();
    assert_eq!(contact.get_name(), "");
    assert_eq!(contact.get_display_name(), "Carl");
 }
@@ -714,7 +713,7 @@ async fn test_parse_ndn_group_msg() -> Result<()> {

    assert_eq!(
        last_msg.text,
-        stock_str::failed_sending_to(&t, "assidhfaaspocwaeofi@gmail.com").await
+        Some(stock_str::failed_sending_to(&t, "assidhfaaspocwaeofi@gmail.com").await,)
    );
    assert_eq!(last_msg.from_id, ContactId::INFO);
    Ok(())
@@ -735,7 +734,7 @@ async fn load_imf_email(context: &Context, imf_raw: &[u8]) -> Message {
 async fn test_html_only_mail() {
    let t = TestContext::new_alice().await;
    let msg = load_imf_email(&t, include_bytes!("../../test-data/message/wrong-html.eml")).await;
-    assert_eq!(msg.text, "Guten Abend,\n\nLots of text\n\ntext with Umlaut ä...\n\nMfG\n\n--------------------------------------\n\n[Camping ](https://example.com/)\n\nsomeaddress\n\nsometown");
+    assert_eq!(msg.text.unwrap(), "   Guten Abend,   \n\n   Lots of text   \n\n   text with Umlaut ä...   \n\n   MfG    [...]");
 }

 static GH_MAILINGLIST: &[u8] =
@@ -794,18 +793,16 @@ async fn test_github_mailing_list() -> Result<()> {

    let chats = Chatlist::try_load(&t.ctx, 0, None, None).await?;
    assert_eq!(chats.len(), 1);
-    let chats = Chatlist::try_load(&t.ctx, DC_GCL_FOR_FORWARDING, None, None).await?;
-    assert_eq!(chats.len(), 0);
    let contacts = Contact::get_all(&t.ctx, 0, None).await?;
    assert_eq!(contacts.len(), 0); // mailing list recipients and senders do not count as "known contacts"

    let msg1 = get_chat_msg(&t, chat_id, 0, 2).await;
-    let contact1 = Contact::get_by_id(&t.ctx, msg1.from_id).await?;
+    let contact1 = Contact::load_from_db(&t.ctx, msg1.from_id).await?;
    assert_eq!(contact1.get_addr(), "notifications@github.com");
    assert_eq!(contact1.get_display_name(), "notifications@github.com"); // Make sure this is not "Max Mustermann" or somethinng

    let msg2 = get_chat_msg(&t, chat_id, 1, 2).await;
-    let contact2 = Contact::get_by_id(&t.ctx, msg2.from_id).await?;
+    let contact2 = Contact::load_from_db(&t.ctx, msg2.from_id).await?;
    assert_eq!(contact2.get_addr(), "notifications@github.com");

    assert_eq!(msg1.get_override_sender_name().unwrap(), "Max Mustermann");
@@ -850,7 +847,7 @@ async fn test_classic_mailing_list() -> Result<()> {
    assert_eq!(chat.get_mailinglist_addr(), Some("delta@codespeak.net"));

    let msg = get_chat_msg(&t, chat_id, 0, 1).await;
-    let contact1 = Contact::get_by_id(&t.ctx, msg.from_id).await.unwrap();
+    let contact1 = Contact::load_from_db(&t.ctx, msg.from_id).await.unwrap();
    assert_eq!(contact1.get_addr(), "bob@posteo.org");

    let sent = t.send_text(chat.id, "Hello mailinglist!").await;
@@ -893,7 +890,7 @@ async fn test_other_device_writes_to_mailinglist() -> Result<()> {
        Contact::lookup_id_by_addr(&t, "delta@codespeak.net", Origin::Unknown)
            .await?
            .unwrap();
-    let list_post_contact = Contact::get_by_id(&t, list_post_contact_id).await?;
+    let list_post_contact = Contact::load_from_db(&t, list_post_contact_id).await?;
    assert_eq!(
        list_post_contact.param.get(Param::ListId).unwrap(),
        "delta.codespeak.net"
@@ -1161,7 +1158,10 @@ async fn test_dhl_mailing_list() -> Result<()> {
    .await
    .unwrap();
    let msg = t.get_last_msg().await;
-    assert_eq!(msg.text, "Ihr Paket ist in der Packstation 123 – bla bla");
+    assert_eq!(
+        msg.text,
+        Some("Ihr Paket ist in der Packstation 123 – bla bla".to_string())
+    );
    assert!(msg.has_html());
    let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Mailinglist);
@@ -1186,7 +1186,10 @@ async fn test_dpd_mailing_list() -> Result<()> {
    .await
    .unwrap();
    let msg = t.get_last_msg().await;
-    assert_eq!(msg.text, "Bald ist Ihr DPD Paket da – bla bla");
+    assert_eq!(
+        msg.text,
+        Some("Bald ist Ihr DPD Paket da – bla bla".to_string())
+    );
    assert!(msg.has_html());
    let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Mailinglist);
@@ -1291,7 +1294,10 @@ async fn test_mailing_list_with_mimepart_footer() {
    .await
    .unwrap();
    let msg = t.get_last_msg().await;
-    assert_eq!(msg.text, "[Intern] important stuff – Hi mr ... [text part]");
+    assert_eq!(
+        msg.text,
+        Some("[Intern] important stuff – Hi mr ... [text part]".to_string())
+    );
    assert!(msg.has_html());
    let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
    assert_eq!(get_chat_msgs(&t, msg.chat_id).await.unwrap().len(), 1);
@@ -1314,7 +1320,7 @@ async fn test_mailing_list_with_mimepart_footer_signed() {
    .unwrap();
    let msg = t.get_last_msg().await;
    assert_eq!(get_chat_msgs(&t, msg.chat_id).await.unwrap().len(), 1);
-    let text = msg.text.clone();
+    let text = msg.text.clone().unwrap();
    assert!(text.contains("content text"));
    assert!(!text.contains("footer text"));
    assert!(msg.has_html());
@@ -1359,7 +1365,7 @@ async fn test_apply_mailinglist_changes_assigned_by_reply() {
    .await
    .unwrap()
    .unwrap();
-    let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
+    let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
    assert_eq!(
        contact.param.get(Param::ListId).unwrap(),
        "deltachat-core-rust.deltachat.github.com"
@@ -1378,7 +1384,7 @@ async fn test_mailing_list_chat_message() {
    .await
    .unwrap();
    let msg = t.get_last_msg().await;
-    assert_eq!(msg.text, "hello, this is a test 👋\n\n_______________________________________________\nTest1 mailing list -- test1@example.net\nTo unsubscribe send an email to test1-leave@example.net".to_string());
+    assert_eq!(msg.text, Some("hello, this is a test 👋\n\n_______________________________________________\nTest1 mailing list -- test1@example.net\nTo unsubscribe send an email to test1-leave@example.net".to_string()));
    assert!(!msg.has_html());
    let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Mailinglist);
@@ -1458,10 +1464,8 @@ async fn test_pdf_filename_simple() {
    )
    .await;
    assert_eq!(msg.viewtype, Viewtype::File);
-    assert_eq!(msg.text, "mail body");
-    let file_path = msg.param.get(Param::File).unwrap();
-    assert!(file_path.starts_with("$BLOBDIR/simple"));
-    assert!(file_path.ends_with(".pdf"));
+    assert_eq!(msg.text.unwrap(), "mail body");
+    assert_eq!(msg.param.get(Param::File).unwrap(), "$BLOBDIR/simple.pdf");
 }

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1474,10 +1478,11 @@ async fn test_pdf_filename_continuation() {
    )
    .await;
    assert_eq!(msg.viewtype, Viewtype::File);
-    assert_eq!(msg.text, "mail body");
-    let file_path = msg.param.get(Param::File).unwrap();
-    assert!(file_path.starts_with("$BLOBDIR/test pdf äöüß"));
-    assert!(file_path.ends_with(".pdf"));
+    assert_eq!(msg.text.unwrap(), "mail body");
+    assert_eq!(
+        msg.param.get(Param::File).unwrap(),
+        "$BLOBDIR/test pdf äöüß.pdf"
+    );
 }

 /// HTML-images may come with many embedded images, eg. tiny icons, corners for formatting,
@@ -1552,7 +1557,7 @@ async fn test_in_reply_to() {
    .unwrap();

    let msg = t.get_last_msg().await;
-    assert_eq!(msg.get_text(), "reply foo");
+    assert_eq!(msg.get_text().unwrap(), "reply foo");

    // Load the first message from the same chat.
    let msgs = chat::get_chat_msgs(&t, msg.chat_id).await.unwrap();
@@ -1563,7 +1568,7 @@ async fn test_in_reply_to() {
    };

    let reply_msg = Message::load_from_db(&t, *msg_id).await.unwrap();
-    assert_eq!(reply_msg.get_text(), "hello foo");
+    assert_eq!(reply_msg.get_text().unwrap(), "hello foo");

    // Check that reply got into the same chat as the original message.
    assert_eq!(msg.chat_id, reply_msg.chat_id);
@@ -1621,7 +1626,7 @@ async fn test_in_reply_to_two_member_group() {
    let msg = t.get_last_msg().await;
    let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Group);
-    assert_eq!(msg.get_text(), "classic reply");
+    assert_eq!(msg.get_text().unwrap(), "classic reply");

    // Receive a Delta Chat reply from Alice.
    // It is assigned to group chat, because it has a group ID.
@@ -1647,7 +1652,7 @@ async fn test_in_reply_to_two_member_group() {
    let msg = t.get_last_msg().await;
    let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Group);
-    assert_eq!(msg.get_text(), "chat reply");
+    assert_eq!(msg.get_text().unwrap(), "chat reply");

    // Receive a private Delta Chat reply from Alice.
    // It is assigned to 1:1 chat, because it has no group ID,
@@ -1674,7 +1679,7 @@ async fn test_in_reply_to_two_member_group() {
    let msg = t.get_last_msg().await;
    let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Single);
-    assert_eq!(msg.get_text(), "private reply");
+    assert_eq!(msg.get_text().unwrap(), "private reply");
 }

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1685,7 +1690,7 @@ async fn test_save_mime_headers_off() -> anyhow::Result<()> {
    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_eq!(msg.get_text(), Some("hi!".to_string()));
    assert!(!msg.get_showpadlock());
    let mime = message::get_mime_headers(&bob, msg.id).await?;
    assert!(mime.is_empty());
@@ -1704,7 +1709,7 @@ async fn test_save_mime_headers_on() -> anyhow::Result<()> {
    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_eq!(msg.get_text(), Some("hi!".to_string()));
    assert!(!msg.get_showpadlock());
    let mime = message::get_mime_headers(&bob, msg.id).await?;
    let mime_str = String::from_utf8_lossy(&mime);
@@ -1715,7 +1720,7 @@ async fn test_save_mime_headers_on() -> anyhow::Result<()> {
    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_eq!(msg.get_text(), Some("ho!".to_string()));
    assert!(msg.get_showpadlock());
    let mime = message::get_mime_headers(&alice, msg.id).await?;
    let mime_str = String::from_utf8_lossy(&mime);
@@ -1775,7 +1780,7 @@ async fn create_test_alias(chat_request: bool, group_request: bool) -> (TestCont

    let msg = alice.get_last_msg().await;
    assert_eq!(msg.get_subject(), "i have a question");
-    assert!(msg.get_text().contains("hi support!"));
+    assert!(msg.get_text().unwrap().contains("hi support!"));
    let chat = Chat::load_from_db(&alice, msg.chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Group);
    assert_eq!(get_chat_msgs(&alice, chat.id).await.unwrap().len(), 1);
@@ -1800,7 +1805,7 @@ async fn create_test_alias(chat_request: bool, group_request: bool) -> (TestCont
    let msg = Message::load_from_db(&claire, msg_id).await.unwrap();
    msg.chat_id.accept(&claire).await.unwrap();
    assert_eq!(msg.get_subject(), "i have a question");
-    assert!(msg.get_text().contains("hi support!"));
+    assert!(msg.get_text().unwrap().contains("hi support!"));
    let chat = Chat::load_from_db(&claire, msg.chat_id).await.unwrap();
    if group_request {
        assert_eq!(chat.typ, Chattype::Group);
@@ -1821,7 +1826,7 @@ async fn check_alias_reply(reply: &[u8], chat_request: bool, group_request: bool
    receive_imf(&alice, reply, false).await.unwrap();
    let answer = alice.get_last_msg().await;
    assert_eq!(answer.get_subject(), "Re: i have a question");
-    assert!(answer.get_text().contains("the version is 1.0"));
+    assert!(answer.get_text().unwrap().contains("the version is 1.0"));
    assert_eq!(answer.chat_id, request.chat_id);
    let chat_contacts = get_chat_contacts(&alice, answer.chat_id)
        .await
@@ -1844,7 +1849,7 @@ async fn check_alias_reply(reply: &[u8], chat_request: bool, group_request: bool
    receive_imf(&claire, reply, false).await.unwrap();
    let answer = claire.get_last_msg().await;
    assert_eq!(answer.get_subject(), "Re: i have a question");
-    assert!(answer.get_text().contains("the version is 1.0"));
+    assert!(answer.get_text().unwrap().contains("the version is 1.0"));
    assert_eq!(answer.chat_id, request.chat_id);
    assert_eq!(
        answer.get_override_sender_name().unwrap(),
@@ -1916,7 +1921,7 @@ async fn test_dont_assign_to_trash_by_parent() {
    chat_id.accept(&t).await.unwrap();
    let msg = get_chat_msg(&t, chat_id, 0, 1).await; // Make sure that the message is actually in the chat
    assert!(!msg.chat_id.is_special());
-    assert_eq!(msg.text, "Hi – hello");
+    assert_eq!(msg.text.unwrap(), "Hi – hello");

    println!("\n========= Delete the message ==========");
    msg.id.trash(&t).await.unwrap();
@@ -1940,7 +1945,7 @@ async fn test_dont_assign_to_trash_by_parent() {
    .unwrap();
    let msg = t.get_last_msg().await;
    assert!(!msg.chat_id.is_special()); // Esp. check that the chat_id is not TRASH
-    assert_eq!(msg.text, "Reply");
+    assert_eq!(msg.text.unwrap(), "Reply");
 }

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1991,7 +1996,7 @@ Message content",

    // Outgoing email should create a chat.
    let msg = alice.get_last_msg().await;
-    assert_eq!(msg.get_text(), "Subj – Message content");
+    assert_eq!(msg.get_text().unwrap(), "Subj – Message content");
 }

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -2033,12 +2038,12 @@ Message content
 Second signature";

    receive_imf(&alice, first_message, false).await?;
-    let contact = Contact::get_by_id(&alice, bob_contact_id).await?;
+    let contact = Contact::load_from_db(&alice, bob_contact_id).await?;
    assert_eq!(contact.get_status(), "First signature");
    assert_eq!(contact.get_display_name(), "Bob1");

    receive_imf(&alice, second_message, false).await?;
-    let contact = Contact::get_by_id(&alice, bob_contact_id).await?;
+    let contact = Contact::load_from_db(&alice, bob_contact_id).await?;
    assert_eq!(contact.get_status(), "Second signature");
    assert_eq!(contact.get_display_name(), "Bob2");

@@ -2046,7 +2051,7 @@ Second signature";
    receive_imf(&alice, first_message, false).await?;

    // No change because last message is duplicate of the first.
-    let contact = Contact::get_by_id(&alice, bob_contact_id).await?;
+    let contact = Contact::load_from_db(&alice, bob_contact_id).await?;
    assert_eq!(contact.get_status(), "Second signature");
    assert_eq!(contact.get_display_name(), "Bob2");

@@ -2064,7 +2069,7 @@ async fn test_ignore_footer_status_from_mailinglist() -> Result<()> {
    )
    .await?
    .0;
-    let bob = Contact::get_by_id(&t, bob_id).await?;
+    let bob = Contact::load_from_db(&t, bob_id).await?;
    assert_eq!(bob.get_status(), "");
    assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 0);

@@ -2084,7 +2089,7 @@ Original signature",
    .await?;
    let msg = t.get_last_msg().await;
    let one2one_chat_id = msg.chat_id;
-    let bob = Contact::get_by_id(&t, bob_id).await?;
+    let bob = Contact::load_from_db(&t, bob_id).await?;
    assert_eq!(bob.get_status(), "Original signature");
    assert!(!msg.has_html());

@@ -2107,7 +2112,7 @@ Tap here to unsubscribe ...",
    )
    .await?;
    let ml_chat_id = t.get_last_msg().await.chat_id;
-    let bob = Contact::get_by_id(&t, bob_id).await?;
+    let bob = Contact::load_from_db(&t, bob_id).await?;
    assert_eq!(bob.get_status(), "Original signature");

    receive_imf(
@@ -2124,7 +2129,7 @@ Original signature updated",
        false,
    )
    .await?;
-    let bob = Contact::get_by_id(&t, bob_id).await?;
+    let bob = Contact::load_from_db(&t, bob_id).await?;
    assert_eq!(bob.get_status(), "Original signature updated");
    assert_eq!(get_chat_msgs(&t, one2one_chat_id).await?.len(), 2);
    assert_eq!(get_chat_msgs(&t, ml_chat_id).await?.len(), 1);
@@ -2159,7 +2164,7 @@ sig wednesday",
    )
    .await?;
    let chat_id = t.get_last_msg().await.chat_id;
-    let bob = Contact::get_by_id(&t, bob_id).await?;
+    let bob = Contact::load_from_db(&t, bob_id).await?;
    assert_eq!(bob.get_status(), "sig wednesday");
    assert_eq!(get_chat_msgs(&t, chat_id).await?.len(), 1);

@@ -2177,7 +2182,7 @@ sig tuesday",
        false,
    )
    .await?;
-    let bob = Contact::get_by_id(&t, bob_id).await?;
+    let bob = Contact::load_from_db(&t, bob_id).await?;
    assert_eq!(bob.get_status(), "sig wednesday");
    assert_eq!(get_chat_msgs(&t, chat_id).await?.len(), 2);

@@ -2195,7 +2200,7 @@ sig thursday",
        false,
    )
    .await?;
-    let bob = Contact::get_by_id(&t, bob_id).await?;
+    let bob = Contact::load_from_db(&t, bob_id).await?;
    assert_eq!(bob.get_status(), "sig thursday");
    assert_eq!(get_chat_msgs(&t, chat_id).await?.len(), 3);

@@ -2238,7 +2243,7 @@ Message-ID: <Gr.eJ_llQIXf0K.buxmrnMmG0Y@gmx.de>"

        let group_msg = t.get_last_msg().await;
        assert_eq!(
-            group_msg.text,
+            group_msg.text.unwrap(),
            if *outgoing_is_classical {
                "single reply-to – Hello, I\'ve just created the group \"single reply-to\" for us."
            } else {
@@ -2278,7 +2283,7 @@ Private reply"#,
        .unwrap();

        let private_msg = t.get_last_msg().await;
-        assert_eq!(private_msg.text, "Private reply");
+        assert_eq!(private_msg.text.unwrap(), "Private reply");
        let private_chat = Chat::load_from_db(&t, private_msg.chat_id).await.unwrap();
        assert_eq!(private_chat.typ, Chattype::Single);
        assert_ne!(private_msg.chat_id, group_msg.chat_id);
@@ -2327,7 +2332,7 @@ Message-ID: <Gr.iy1KCE2y65_.mH2TM52miv9@testrun.org>"
        .unwrap();
        let group_msg = t.get_last_msg().await;
        assert_eq!(
-            group_msg.text,
+            group_msg.text.unwrap(),
            if *outgoing_is_classical {
                "single reply-to – Hello, I\'ve just created the group \"single reply-to\" for us."
            } else {
@@ -2373,7 +2378,7 @@ Sent with my Delta Chat Messenger: https://delta.chat
        .unwrap();

        let private_msg = t.get_last_msg().await;
-        assert_eq!(private_msg.text, "Private reply");
+        assert_eq!(private_msg.text.unwrap(), "Private reply");
        let private_chat = Chat::load_from_db(&t, private_msg.chat_id).await.unwrap();
        assert_eq!(private_chat.typ, Chattype::Single);
        assert_ne!(private_msg.chat_id, group_msg.chat_id);
@@ -2415,7 +2420,7 @@ Message-ID: <Gr.eJ_llQIXf0K.buxmrnMmG0Y@gmx.de>"

        let group_msg = t.get_last_msg().await;
        assert_eq!(
-            group_msg.text,
+            group_msg.text.unwrap(),
            if *outgoing_is_classical {
                "single reply-to – Hello, I\'ve just created the group \"single reply-to\" for us."
            } else {
@@ -2452,7 +2457,7 @@ Outgoing reply to all"#,
        .unwrap();

        let reply = t.get_last_msg().await;
-        assert_eq!(reply.text, "Out subj – Outgoing reply to all");
+        assert_eq!(reply.text.unwrap(), "Out subj – Outgoing reply to all");
        let reply_chat = Chat::load_from_db(&t, reply.chat_id).await.unwrap();
        assert_eq!(reply_chat.typ, Chattype::Group);
        assert_eq!(reply.chat_id, group_msg.chat_id);
@@ -2475,7 +2480,7 @@ Reply to all"#,
        .unwrap();

        let reply = t.get_last_msg().await;
-        assert_eq!(reply.text, "In subj – Reply to all");
+        assert_eq!(reply.text.unwrap(), "In subj – Reply to all");
        let reply_chat = Chat::load_from_db(&t, reply.chat_id).await.unwrap();
        assert_eq!(reply_chat.typ, Chattype::Group);
        assert_eq!(reply.chat_id, group_msg.chat_id);
@@ -2761,7 +2766,7 @@ Hi, I created a group"#,
    .await?;
    let msg_out = t.get_last_msg().await;
    assert_eq!(msg_out.from_id, ContactId::SELF);
-    assert_eq!(msg_out.text, "Hi, I created a group");
+    assert_eq!(msg_out.text.unwrap(), "Hi, I created a group");
    assert_eq!(msg_out.in_reply_to, None);

    // Bob replies from a different address
@@ -2785,7 +2790,7 @@ Reply from different address
    .await?;
    let msg_in = t.get_last_msg().await;
    assert_eq!(msg_in.to_id, ContactId::SELF);
-    assert_eq!(msg_in.text, "Reply from different address");
+    assert_eq!(msg_in.text.unwrap(), "Reply from different address");
    assert_eq!(
        msg_in.in_reply_to.unwrap(),
        "Gr.qetqsutor7a.Aresxresy-4@deltachat.de"
@@ -2801,7 +2806,7 @@ Reply from different address
 }

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_long_and_duplicated_filenames() -> Result<()> {
+async fn test_long_filenames() -> Result<()> {
    let mut tcm = TestContextManager::new();
    let alice = tcm.alice().await;
    let bob = tcm.bob().await;
@@ -2813,7 +2818,6 @@ async fn test_long_and_duplicated_filenames() -> Result<()> {
        "foo. .tar.gz",
        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.tar.gz",
        "a.tar.gz",
-        "a.tar.gz",
        "a.a..a.a.a.a.tar.gz",
    ] {
        let attachment = alice.blobdir.join(filename_sent);
@@ -2828,19 +2832,22 @@ async fn test_long_and_duplicated_filenames() -> Result<()> {

        let msg_bob = bob.recv_msg(&sent).await;

-        async fn check_message(msg: &Message, t: &TestContext, filename: &str, content: &str) {
+        async fn check_message(msg: &Message, t: &TestContext, content: &str) {
            assert_eq!(msg.get_viewtype(), Viewtype::File);
            let resulting_filename = msg.get_filename().unwrap();
-            assert_eq!(resulting_filename, filename);
            let path = msg.get_file(t).unwrap();
+            assert!(
+                resulting_filename.ends_with(".tar.gz"),
+                "{resulting_filename:?} doesn't end with .tar.gz, path: {path:?}"
+            );
            assert!(
                path.to_str().unwrap().ends_with(".tar.gz"),
                "path {path:?} doesn't end with .tar.gz"
            );
            assert_eq!(fs::read_to_string(path).await.unwrap(), content);
        }
-        check_message(&msg_alice, &alice, filename_sent, &content).await;
-        check_message(&msg_bob, &bob, filename_sent, &content).await;
+        check_message(&msg_alice, &alice, &content).await;
+        check_message(&msg_bob, &bob, &content).await;
    }

    Ok(())
@@ -2861,22 +2868,22 @@ async fn test_accept_outgoing() -> Result<()> {
    alice1.recv_msg(&sent).await;
    alice2.recv_msg(&sent).await;
    let alice1_msg = bob2.recv_msg(&sent).await;
-    assert_eq!(alice1_msg.text, "Hello!");
+    assert_eq!(alice1_msg.text.unwrap(), "Hello!");
    let alice1_chat = chat::Chat::load_from_db(&alice1, alice1_msg.chat_id).await?;
    assert!(alice1_chat.is_contact_request());

    let alice2_msg = alice2.get_last_msg().await;
-    assert_eq!(alice2_msg.text, "Hello!");
+    assert_eq!(alice2_msg.text.unwrap(), "Hello!");
    let alice2_chat = chat::Chat::load_from_db(&alice2, alice2_msg.chat_id).await?;
    assert!(alice2_chat.is_contact_request());

    let bob1_msg = bob1.get_last_msg().await;
-    assert_eq!(bob1_msg.text, "Hello!");
+    assert_eq!(bob1_msg.text.unwrap(), "Hello!");
    let bob1_chat = chat::Chat::load_from_db(&bob1, bob1_msg.chat_id).await?;
    assert!(!bob1_chat.is_contact_request());

    let bob2_msg = bob2.get_last_msg().await;
-    assert_eq!(bob2_msg.text, "Hello!");
+    assert_eq!(bob2_msg.text.unwrap(), "Hello!");
    let bob2_chat = chat::Chat::load_from_db(&bob2, bob2_msg.chat_id).await?;
    assert!(!bob2_chat.is_contact_request());

@@ -2922,7 +2929,7 @@ async fn test_outgoing_private_reply_multidevice() -> Result<()> {
    assert_eq!(received.from_id, alice1_bob_contact.id);
    assert_eq!(received.to_id, ContactId::SELF);
    assert!(!received.hidden);
-    assert_eq!(received.text, "Hello all!");
+    assert_eq!(received.text, Some("Hello all!".to_string()));
    assert_eq!(received.in_reply_to, None);
    assert_eq!(received.chat_blocked, Blocked::Request);

@@ -2932,7 +2939,7 @@ async fn test_outgoing_private_reply_multidevice() -> Result<()> {
    assert_eq!(received_group.can_send(&alice1).await?, false); // Can't send because it's Blocked::Request

    let mut msg_out = Message::new(Viewtype::Text);
-    msg_out.set_text("Private reply".to_string());
+    msg_out.set_text(Some("Private reply".to_string()));

    assert_eq!(received_group.blocked, Blocked::Request);
    msg_out.set_quote(&alice1, Some(&received)).await?;
@@ -2950,10 +2957,10 @@ async fn test_outgoing_private_reply_multidevice() -> Result<()> {
    assert_eq!(received.from_id, ContactId::SELF);
    assert_eq!(received.to_id, alice2_bob_contact.id);
    assert!(!received.hidden);
-    assert_eq!(received.text, "Private reply");
+    assert_eq!(received.text, Some("Private reply".to_string()));
    assert_eq!(
        received.parent(&alice2).await?.unwrap().text,
-        "Hello all!".to_string()
+        Some("Hello all!".to_string())
    );
    assert_eq!(received.chat_blocked, Blocked::Not);

@@ -3014,13 +3021,13 @@ async fn test_no_private_reply_to_blocked_account() -> Result<()> {

    // =============== Alice replies private to Bob ==============
    let received = alice.get_last_msg().await;
-    assert_eq!(received.text, "Hello all!");
+    assert_eq!(received.text, Some("Hello all!".to_string()));

    let received_group = Chat::load_from_db(&alice, received.chat_id).await?;
    assert_eq!(received_group.typ, Chattype::Group);

    let mut msg_out = Message::new(Viewtype::Text);
-    msg_out.set_text("Private reply".to_string());
+    msg_out.set_text(Some("Private reply".to_string()));
    msg_out.set_quote(&alice, Some(&received)).await?;

    let alice_bob_chat = alice.create_chat(&bob).await;
@@ -3036,7 +3043,7 @@ async fn test_no_private_reply_to_blocked_account() -> Result<()> {
    // since only chat is a group, no new open chat has been created
    assert_eq!(chat.typ, Chattype::Group);
    let received = bob.get_last_msg().await;
-    assert_eq!(received.text, "Hello all!");
+    assert_eq!(received.text, Some("Hello all!".to_string()));

    // =============== Bob unblocks Alice ================
    // test if the blocked chat is restored correctly
@@ -3047,7 +3054,7 @@ async fn test_no_private_reply_to_blocked_account() -> Result<()> {
    let chat = Chat::load_from_db(&bob, chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Single);
    let received = bob.get_last_msg().await;
-    assert_eq!(received.text, "Private reply");
+    assert_eq!(received.text, Some("Private reply".to_string()));

    Ok(())
 }
@@ -3563,119 +3570,3 @@ async fn test_mua_can_add() -> Result<()> {
    );
    Ok(())
 }
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_mua_can_readd() -> Result<()> {
-    let alice = TestContext::new_alice().await;
-
-    // Alice creates chat with 3 contacts.
-    let msg = receive_imf(
-        &alice,
-        b"Subject: =?utf-8?q?Message_from_alice=40example=2Eorg?=\r\n\
-            From: alice@example.org\r\n\
-            To: <bob@example.net>, <claire@example.org>, <fiona@example.org> \r\n\
-            Date: Mon, 12 Dec 2022 14:30:39 +0000\r\n\
-            Message-ID: <Mr.alices_original_mail@example.org>\r\n\
-            Chat-Version: 1.0\r\n\
-            \r\n\
-            Hi!\r\n",
-        false,
-    )
-    .await?
-    .unwrap();
-    let alice_chat = Chat::load_from_db(&alice, msg.chat_id).await?;
-    assert_eq!(alice_chat.typ, Chattype::Group);
-    assert!(is_contact_in_chat(&alice, alice_chat.id, ContactId::SELF).await?);
-
-    // And leaves it.
-    remove_contact_from_chat(&alice, alice_chat.id, ContactId::SELF).await?;
-    let alice_chat = Chat::load_from_db(&alice, alice_chat.id).await?;
-    assert!(!is_contact_in_chat(&alice, alice_chat.id, ContactId::SELF).await?);
-
-    // Bob uses a classical MUA to answer, adding Alice back.
-    receive_imf(
-        &alice,
-        b"Subject: Re: Message from alice\r\n\
-            From: <bob@example.net>\r\n\
-            To: <alice@example.org>, <claire@example.org>, <fiona@example.org>\r\n\
-            Date: Mon, 12 Dec 2022 14:32:39 +0000\r\n\
-            Message-ID: <bobs_answer_to_two_recipients@example.net>\r\n\
-            In-Reply-To: <Mr.alices_original_mail@example.org>\r\n\
-            \r\n\
-            Hi back!\r\n",
-        false,
-    )
-    .await?
-    .unwrap();
-
-    let alice_chat = Chat::load_from_db(&alice, alice_chat.id).await?;
-    assert!(is_contact_in_chat(&alice, alice_chat.id, ContactId::SELF).await?);
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_recreate_member_list_on_missing_add_of_self() -> Result<()> {
-    let alice = TestContext::new_alice().await;
-    let bob = TestContext::new_bob().await;
-    let alice_chat_id = create_group_chat(&alice, ProtectionStatus::Unprotected, "Group").await?;
-    add_contact_to_chat(
-        &alice,
-        alice_chat_id,
-        Contact::create(&alice, "bob", &bob.get_config(Config::Addr).await?.unwrap()).await?,
-    )
-    .await?;
-    send_text_msg(&alice, alice_chat_id, "populate".to_string()).await?;
-    alice.pop_sent_msg().await;
-    remove_contact_from_chat(&alice, alice_chat_id, ContactId::SELF).await?;
-    let bob_chat_id = bob.recv_msg(&alice.pop_sent_msg().await).await.chat_id;
-
-    // Bob missed the message adding them, but must recreate the member list.
-    assert_eq!(get_chat_contacts(&bob, bob_chat_id).await?.len(), 1);
-    assert!(is_contact_in_chat(&bob, bob_chat_id, ContactId::SELF).await?);
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_keep_member_list_if_possibly_nomember() -> Result<()> {
-    let alice = TestContext::new_alice().await;
-    let bob = TestContext::new_bob().await;
-    let alice_chat_id = create_group_chat(&alice, ProtectionStatus::Unprotected, "Group").await?;
-    add_contact_to_chat(
-        &alice,
-        alice_chat_id,
-        Contact::create(&alice, "bob", &bob.get_config(Config::Addr).await?.unwrap()).await?,
-    )
-    .await?;
-    send_text_msg(&alice, alice_chat_id, "populate".to_string()).await?;
-    let bob_chat_id = bob.recv_msg(&alice.pop_sent_msg().await).await.chat_id;
-
-    let fiona = TestContext::new_fiona().await;
-    add_contact_to_chat(
-        &alice,
-        alice_chat_id,
-        Contact::create(
-            &alice,
-            "fiona",
-            &fiona.get_config(Config::Addr).await?.unwrap(),
-        )
-        .await?,
-    )
-    .await?;
-    let fiona_chat_id = fiona.recv_msg(&alice.pop_sent_msg().await).await.chat_id;
-    fiona_chat_id.accept(&fiona).await?;
-
-    send_text_msg(&fiona, fiona_chat_id, "hi".to_string()).await?;
-    bob.recv_msg(&fiona.pop_sent_msg().await).await;
-
-    // Bob missed the message adding fiona, but mustn't recreate the member list.
-    assert_eq!(get_chat_contacts(&bob, bob_chat_id).await?.len(), 2);
-    assert!(is_contact_in_chat(&bob, bob_chat_id, ContactId::SELF).await?);
-    let bob_alice_contact = Contact::create(
-        &bob,
-        "alice",
-        &alice.get_config(Config::Addr).await?.unwrap(),
-    )
-    .await?;
-    assert!(is_contact_in_chat(&bob, bob_chat_id, bob_alice_contact).await?);
-    Ok(())
-}
@@ -178,7 +178,7 @@ async fn send_alice_handshake_msg(
 ) -> Result<()> {
    let mut msg = Message {
        viewtype: Viewtype::Text,
-        text: format!("Secure-Join: {step}"),
+        text: Some(format!("Secure-Join: {step}")),
        hidden: true,
        ..Default::default()
    };
@@ -210,7 +210,7 @@ async fn fingerprint_equals_sender(
    fingerprint: &Fingerprint,
    contact_id: ContactId,
 ) -> Result<bool> {
-    let contact = Contact::get_by_id(context, contact_id).await?;
+    let contact = Contact::load_from_db(context, contact_id).await?;
    let peerstate = match Peerstate::from_addr(context, contact.get_addr()).await {
        Ok(peerstate) => peerstate,
        Err(err) => {
@@ -411,7 +411,7 @@ pub(crate) async fn handle_securejoin_handshake(
                .await?;
                return Ok(HandshakeMessage::Ignore);
            }
-            let contact_addr = Contact::get_by_id(context, contact_id)
+            let contact_addr = Contact::load_from_db(context, contact_id)
                .await?
                .get_addr()
                .to_owned();
@@ -580,7 +580,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
                .await?;
                return Ok(HandshakeMessage::Ignore);
            }
-            let addr = Contact::get_by_id(context, contact_id)
+            let addr = Contact::load_from_db(context, contact_id)
                .await?
                .get_addr()
                .to_lowercase();
@@ -640,7 +640,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
                if mark_peer_as_verified(
                    context,
                    fingerprint,
-                    Contact::get_by_id(context, contact_id)
+                    Contact::load_from_db(context, contact_id)
                        .await?
                        .get_addr()
                        .to_owned(),
@@ -889,7 +889,7 @@ mod tests {
                .await
                .expect("Error looking up contact")
                .expect("Contact not found");
-        let contact_bob = Contact::get_by_id(&alice.ctx, contact_bob_id)
+        let contact_bob = Contact::load_from_db(&alice.ctx, contact_bob_id)
            .await
            .unwrap();
        assert_eq!(
@@ -933,7 +933,8 @@ mod tests {
                .expect("No messages in Alice's 1:1 chat");
            let msg = Message::load_from_db(&alice.ctx, msg_id).await.unwrap();
            assert!(msg.is_info());
-            assert!(msg.get_text().contains("bob@example.net verified"));
+            let text = msg.get_text().unwrap();
+            assert!(text.contains("bob@example.net verified"));
        }

        // Check Alice sent the right message to Bob.
@@ -951,7 +952,7 @@ mod tests {
                .await
                .expect("Error looking up contact")
                .expect("Contact not found");
-        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id)
+        let contact_alice = Contact::load_from_db(&bob.ctx, contact_alice_id)
            .await
            .unwrap();
        assert_eq!(
@@ -981,7 +982,8 @@ mod tests {
                .expect("No messages in Bob's 1:1 chat");
            let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap();
            assert!(msg.is_info());
-            assert!(msg.get_text().contains("alice@example.org verified"));
+            let text = msg.get_text().unwrap();
+            assert!(text.contains("alice@example.org verified"));
        }

        // Check Bob sent the final message
@@ -1076,7 +1078,7 @@ mod tests {
            Origin::ManuallyCreated,
        )
        .await?;
-        let contact_bob = Contact::get_by_id(&alice.ctx, contact_bob_id).await?;
+        let contact_bob = Contact::load_from_db(&alice.ctx, contact_bob_id).await?;
        assert_eq!(
            contact_bob.is_verified(&alice.ctx).await?,
            VerifiedStatus::Unverified
@@ -1103,7 +1105,7 @@ mod tests {
                .await
                .expect("Error looking up contact")
                .expect("Contact not found");
-        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id).await?;
+        let contact_alice = Contact::load_from_db(&bob.ctx, contact_alice_id).await?;
        assert_eq!(
            contact_bob.is_verified(&bob.ctx).await?,
            VerifiedStatus::Unverified
@@ -1244,7 +1246,7 @@ mod tests {
            Contact::lookup_id_by_addr(&alice.ctx, "bob@example.net", Origin::Unknown)
                .await?
                .expect("Contact not found");
-        let contact_bob = Contact::get_by_id(&alice.ctx, contact_bob_id).await?;
+        let contact_bob = Contact::load_from_db(&alice.ctx, contact_bob_id).await?;
        assert_eq!(
            contact_bob.is_verified(&alice.ctx).await?,
            VerifiedStatus::Unverified
@@ -1290,7 +1292,8 @@ mod tests {
                .expect("No messages in Alice's group chat");
            let msg = Message::load_from_db(&alice.ctx, msg_id).await.unwrap();
            assert!(msg.is_info());
-            assert!(msg.get_text().contains("bob@example.net verified"));
+            let text = msg.get_text().unwrap();
+            assert!(text.contains("bob@example.net verified"));
        }

        // Bob should not yet have Alice verified
@@ -1299,7 +1302,7 @@ mod tests {
                .await
                .expect("Error looking up contact")
                .expect("Contact not found");
-        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id).await?;
+        let contact_alice = Contact::load_from_db(&bob.ctx, contact_alice_id).await?;
        assert_eq!(
            contact_bob.is_verified(&bob.ctx).await?,
            VerifiedStatus::Unverified
@@ -1325,7 +1328,7 @@ mod tests {
            for item in chat::get_chat_msgs(&bob.ctx, bob_chatid).await.unwrap() {
                if let chat::ChatItem::Message { msg_id } = item {
                    let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap();
-                    let text = msg.get_text();
+                    let text = msg.get_text().unwrap();
                    println!("msg {msg_id} text: {text}");
                }
            }
@@ -1337,7 +1340,7 @@ mod tests {
                match msg_iter.next() {
                    Some(chat::ChatItem::Message { msg_id }) => {
                        let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap();
-                        let text = msg.get_text();
+                        let text = msg.get_text().unwrap();
                        match text.contains("alice@example.org verified") {
                            true => {
                                assert!(msg.is_info());
@@ -422,7 +422,7 @@ async fn send_handshake_message(
 ) -> Result<()> {
    let mut msg = Message {
        viewtype: Viewtype::Text,
-        text: step.body_text(invite),
+        text: Some(step.body_text(invite)),
        hidden: true,
        ..Default::default()
    };
@@ -72,7 +72,7 @@ pub(crate) fn split_lines(buf: &str) -> Vec<&str> {
 }

 /// Simplified text and some additional information gained from the input.
-#[derive(Debug, Default, PartialEq, Eq)]
+#[derive(Debug, Default)]
 pub(crate) struct SimplifiedText {
    /// The text itself.
    pub text: String,
@@ -91,14 +91,6 @@ pub(crate) struct SimplifiedText {
    pub footer: Option<String>,
 }

-pub(crate) fn simplify_quote(quote: &str) -> (String, bool) {
-    let quote_lines = split_lines(quote);
-    let (quote_lines, quote_footer_lines) = remove_message_footer(&quote_lines);
-    let is_cut = quote_footer_lines.is_some();
-
-    (render_message(quote_lines, false), is_cut)
-}
-
 /// Simplify message text for chat display.
 /// Remove quotes, signatures, trailing empty lines etc.
 pub(crate) fn simplify(mut input: String, is_chat_message: bool) -> SimplifiedText {
@@ -133,9 +125,11 @@ pub(crate) fn simplify(mut input: String, is_chat_message: bool) -> SimplifiedTe

    if !is_chat_message {
        top_quote = top_quote.map(|quote| {
-            let (quote, quote_cut) = simplify_quote(&quote);
-            is_cut |= quote_cut;
-            quote
+            let quote_lines = split_lines(&quote);
+            let (quote_lines, quote_footer_lines) = remove_message_footer(&quote_lines);
+            is_cut = is_cut || quote_footer_lines.is_some();
+
+            render_message(quote_lines, false)
        });
    }

@@ -55,7 +55,7 @@ impl Smtp {
    }

    /// Disconnect the SMTP transport and drop it entirely.
-    pub fn disconnect(&mut self) {
+    pub async fn disconnect(&mut self) {
        if let Some(mut transport) = self.transport.take() {
            // Closing connection with a QUIT command may take some time, especially if it's a
            // stale connection and an attempt to send the command times out. Send a command in a
@@ -88,7 +88,7 @@ impl Smtp {
    pub async fn connect_configured(&mut self, context: &Context) -> Result<()> {
        if self.has_maybe_stale_connection() {
            info!(context, "Closing stale connection");
-            self.disconnect();
+            self.disconnect().await;
        }

        if self.is_connected() {
@@ -465,13 +465,13 @@ pub(crate) async fn smtp_send(

            // this clears last_success info
            info!(context, "Failed to send message over SMTP, disconnecting");
-            smtp.disconnect();
+            smtp.disconnect().await;

            res
        }
        Err(crate::smtp::send::Error::Envelope(err)) => {
            // Local error, job is invalid, do not retry.
-            smtp.disconnect();
+            smtp.disconnect().await;
            warn!(context, "SMTP job is invalid: {}", err);
            SendResult::Failure(err)
        }
@@ -483,7 +483,7 @@ pub(crate) async fn smtp_send(
        }
        Err(crate::smtp::send::Error::Other(err)) => {
            // Local error, job is invalid, do not retry.
-            smtp.disconnect();
+            smtp.disconnect().await;
            warn!(context, "unable to load job: {}", err);
            SendResult::Failure(err)
        }
@@ -492,20 +492,7 @@ pub(crate) async fn smtp_send(

    if let SendResult::Failure(err) = &status {
        // We couldn't send the message, so mark it as failed
-        match Message::load_from_db(context, msg_id).await {
-            Ok(mut msg) => {
-                if let Err(err) = message::set_msg_failed(context, &mut msg, &err.to_string()).await
-                {
-                    error!(context, "Failed to mark {msg_id} as failed: {err:#}.");
-                }
-            }
-            Err(err) => {
-                error!(
-                    context,
-                    "Failed to load {msg_id} to mark it as failed: {err:#}."
-                );
-            }
-        }
+        message::set_msg_failed(context, msg_id, &err.to_string()).await;
    }
    status
 }
@@ -552,8 +539,7 @@ pub(crate) async fn send_msg_to_smtp(
        )
        .await?;
    if retries > 6 {
-        let mut msg = Message::load_from_db(context, msg_id).await?;
-        message::set_msg_failed(context, &mut msg, "Number of retries exceeded the limit.").await?;
+        message::set_msg_failed(context, msg_id, "Number of retries exceeded the limit.").await;
        context
            .sql
            .execute("DELETE FROM smtp WHERE id=?", (rowid,))
@@ -579,6 +565,24 @@ pub(crate) async fn send_msg_to_smtp(
        )
        .collect::<Vec<_>>();

+    // If there is a msg-id and it does not exist in the db, cancel sending. this happens if
+    // delete_msgs() was called before the generated mime was sent out.
+    if !message::exists(context, msg_id)
+        .await
+        .with_context(|| format!("failed to check message {msg_id} existence"))?
+    {
+        info!(
+            context,
+            "Sending of message {msg_id} (entry {rowid}) was cancelled by the user."
+        );
+        context
+            .sql
+            .execute("DELETE FROM smtp WHERE id=?", (rowid,))
+            .await
+            .context("failed to remove cancelled message from smtp table")?;
+        return Ok(());
+    }
+
    let status = smtp_send(context, &recipients_list, body.as_str(), smtp, msg_id).await;

    match status {
@@ -679,7 +683,7 @@ async fn send_mdn_msg_id(
    contact_id: ContactId,
    smtp: &mut Smtp,
 ) -> Result<()> {
-    let contact = Contact::get_by_id(context, contact_id).await?;
+    let contact = Contact::load_from_db(context, contact_id).await?;
    if contact.is_blocked() {
        return Err(format_err!("Contact is blocked"));
    }
@@ -245,7 +245,7 @@ impl Sql {
            // So, for people who have delete_server enabled, disable it and add a hint to the devicechat:
            if context.get_config_delete_server_after().await?.is_some() {
                let mut msg = Message::new(Viewtype::Text);
-                msg.set_text(stock_str::delete_server_turned_off(context).await);
+                msg.text = Some(stock_str::delete_server_turned_off(context).await);
                add_device_msg(context, None, Some(&mut msg)).await?;
                context
                    .set_config(Config::DeleteServerAfter, Some("0"))
@@ -304,25 +304,6 @@ impl Sql {
        }
    }

-    /// Changes the passphrase of encrypted database.
-    ///
-    /// The database must already be encrypted and the passphrase cannot be empty.
-    /// It is impossible to turn encrypted database into unencrypted
-    /// and vice versa this way, use import/export for this.
-    pub async fn change_passphrase(&self, passphrase: String) -> Result<()> {
-        let mut lock = self.pool.write().await;
-
-        let pool = lock.take().context("SQL connection pool is not open")?;
-        let conn = pool.get().await?;
-        conn.pragma_update(None, "rekey", passphrase.clone())
-            .context("failed to set PRAGMA rekey")?;
-        drop(pool);
-
-        *lock = Some(Self::new_pool(&self.dbfile, passphrase.to_string())?);
-
-        Ok(())
-    }
-
    /// Locks the write transactions mutex in order to make sure that there never are
    /// multiple write transactions at once.
    ///
@@ -774,17 +755,6 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
        .log_err(context)
        .ok();

-    context
-        .sql
-        .execute(
-            "DELETE FROM msgs_status_updates WHERE msg_id NOT IN (SELECT id FROM msgs)",
-            (),
-        )
-        .await
-        .context("failed to remove old webxdc status updates")
-        .log_err(context)
-        .ok();
-
    info!(context, "Housekeeping done.");
    Ok(())
 }
@@ -1132,13 +1102,13 @@ mod tests {

        let chat = t.create_chat_with_contact("bob", "bob@example.com").await;
        let mut new_draft = Message::new(Viewtype::Text);
-        new_draft.set_text("This is my draft".to_string());
+        new_draft.set_text(Some("This is my draft".to_string()));
        chat.id.set_draft(&t, Some(&mut new_draft)).await.unwrap();

        housekeeping(&t).await.unwrap();

        let loaded_draft = chat.id.get_draft(&t).await.unwrap();
-        assert_eq!(loaded_draft.unwrap().text, "This is my draft");
+        assert_eq!(loaded_draft.unwrap().text.unwrap(), "This is my draft");
    }

    /// Tests that `housekeeping` deletes the blobs backup dir which is created normally by
@@ -1265,66 +1235,6 @@ mod tests {
        sql.open(&t, "foo".to_string())
            .await
            .context("failed to open the database second time")?;
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_sql_change_passphrase() -> Result<()> {
-        use tempfile::tempdir;
-
-        // The context is used only for logging.
-        let t = TestContext::new().await;
-
-        // Create a separate empty database for testing.
-        let dir = tempdir()?;
-        let dbfile = dir.path().join("testdb.sqlite");
-        let sql = Sql::new(dbfile.clone());
-
-        sql.open(&t, "foo".to_string())
-            .await
-            .context("failed to open the database first time")?;
-        sql.close().await;
-
-        // Change the passphrase from "foo" to "bar".
-        let sql = Sql::new(dbfile.clone());
-        sql.open(&t, "foo".to_string())
-            .await
-            .context("failed to open the database second time")?;
-        sql.change_passphrase("bar".to_string())
-            .await
-            .context("failed to change passphrase")?;
-
-        // Test that at least two connections are still working.
-        // This ensures that not only the connection which changed the password is working,
-        // but other connections as well.
-        {
-            let lock = sql.pool.read().await;
-            let pool = lock.as_ref().unwrap();
-            let conn1 = pool.get().await?;
-            let conn2 = pool.get().await?;
-            conn1
-                .query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
-                .unwrap();
-            conn2
-                .query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
-                .unwrap();
-        }
-
-        sql.close().await;
-
-        let sql = Sql::new(dbfile);
-
-        // Test that old passphrase is not working.
-        assert!(sql.open(&t, "foo".to_string()).await.is_err());
-
-        // Open the database with the new passphrase.
-        sql.check_passphrase("bar".to_string()).await?;
-        sql.open(&t, "bar".to_string())
-            .await
-            .context("failed to open the database third time")?;
-        sql.close().await;
-
        Ok(())
    }
 }
@@ -516,8 +516,7 @@ DO UPDATE SET rfc724_mid=excluded.rfc724_mid,
 id INTEGER PRIMARY KEY AUTOINCREMENT,
 msg_id INTEGER,
 update_item TEXT DEFAULT '',
-update_item_read INTEGER DEFAULT 0 -- XXX unused
-);
+update_item_read INTEGER DEFAULT 0);
 CREATE INDEX msgs_status_updates_index1 ON msgs_status_updates (msg_id);"#,
            84,
        )
@@ -410,15 +410,6 @@ pub enum StockMessage {

    #[strum(props(fallback = "ℹ️ Account transferred to your second device."))]
    BackupTransferMsgBody = 163,
-
-    #[strum(props(fallback = "I added member %1$s."))]
-    MsgIAddMember = 164,
-
-    #[strum(props(fallback = "I removed member %1$s."))]
-    MsgIDelMember = 165,
-
-    #[strum(props(fallback = "I left the group."))]
-    MsgILeftGroup = 166,
 }

 impl StockMessage {
@@ -597,35 +588,17 @@ pub(crate) async fn msg_grp_img_changed(context: &Context, by_contact: ContactId
    }
 }

-/// Stock string: `I added member %1$s.`.
-///
-/// The `added_member_addr` parameter should be an email address and is looked up in the
-/// contacts to combine with the authorized display name.
-pub(crate) async fn msg_add_member_remote(context: &Context, added_member_addr: &str) -> String {
-    let addr = added_member_addr;
-    let whom = &match Contact::lookup_id_by_addr(context, addr, Origin::Unknown).await {
-        Ok(Some(contact_id)) => Contact::get_by_id(context, contact_id)
-            .await
-            .map(|contact| contact.get_authname_n_addr())
-            .unwrap_or_else(|_| addr.to_string()),
-        _ => addr.to_string(),
-    };
-    translated(context, StockMessage::MsgIAddMember)
-        .await
-        .replace1(whom)
-}
-
-/// Stock string: `You added member %1$s.` or `Member %1$s added by %2$s.`.
+/// Stock string: `Member %1$s added.`.
 ///
 /// The `added_member_addr` parameter should be an email address and is looked up in the
 /// contacts to combine with the display name.
-pub(crate) async fn msg_add_member_local(
+pub(crate) async fn msg_add_member(
    context: &Context,
    added_member_addr: &str,
    by_contact: ContactId,
 ) -> String {
    let addr = added_member_addr;
-    let whom = &match Contact::lookup_id_by_addr(context, addr, Origin::Unknown).await {
+    let who = &match Contact::lookup_id_by_addr(context, addr, Origin::Unknown).await {
        Ok(Some(contact_id)) => Contact::get_by_id(context, contact_id)
            .await
            .map(|contact| contact.get_name_n_addr())
@@ -635,44 +608,26 @@ pub(crate) async fn msg_add_member_local(
    if by_contact == ContactId::SELF {
        translated(context, StockMessage::MsgYouAddMember)
            .await
-            .replace1(whom)
+            .replace1(who)
    } else {
        translated(context, StockMessage::MsgAddMemberBy)
            .await
-            .replace1(whom)
+            .replace1(who)
            .replace2(&by_contact.get_stock_name(context).await)
    }
 }

-/// Stock string: `I removed member %1$s.`.
+/// Stock string: `Member %1$s removed.`.
 ///
 /// The `removed_member_addr` parameter should be an email address and is looked up in
 /// the contacts to combine with the display name.
-pub(crate) async fn msg_del_member_remote(context: &Context, removed_member_addr: &str) -> String {
-    let addr = removed_member_addr;
-    let whom = &match Contact::lookup_id_by_addr(context, addr, Origin::Unknown).await {
-        Ok(Some(contact_id)) => Contact::get_by_id(context, contact_id)
-            .await
-            .map(|contact| contact.get_authname_n_addr())
-            .unwrap_or_else(|_| addr.to_string()),
-        _ => addr.to_string(),
-    };
-    translated(context, StockMessage::MsgIDelMember)
-        .await
-        .replace1(whom)
-}
-
-/// Stock string: `I added member %1$s.` or `Member %1$s removed by %2$s.`.
-///
-/// The `removed_member_addr` parameter should be an email address and is looked up in
-/// the contacts to combine with the display name.
-pub(crate) async fn msg_del_member_local(
+pub(crate) async fn msg_del_member(
    context: &Context,
    removed_member_addr: &str,
    by_contact: ContactId,
 ) -> String {
    let addr = removed_member_addr;
-    let whom = &match Contact::lookup_id_by_addr(context, addr, Origin::Unknown).await {
+    let who = &match Contact::lookup_id_by_addr(context, addr, Origin::Unknown).await {
        Ok(Some(contact_id)) => Contact::get_by_id(context, contact_id)
            .await
            .map(|contact| contact.get_name_n_addr())
@@ -682,22 +637,17 @@ pub(crate) async fn msg_del_member_local(
    if by_contact == ContactId::SELF {
        translated(context, StockMessage::MsgYouDelMember)
            .await
-            .replace1(whom)
+            .replace1(who)
    } else {
        translated(context, StockMessage::MsgDelMemberBy)
            .await
-            .replace1(whom)
+            .replace1(who)
            .replace2(&by_contact.get_stock_name(context).await)
    }
 }

-/// Stock string: `I left the group.`.
-pub(crate) async fn msg_group_left_remote(context: &Context) -> String {
-    translated(context, StockMessage::MsgILeftGroup).await
-}
-
-/// Stock string: `You left the group.` or `Group left by %1$s.`.
-pub(crate) async fn msg_group_left_local(context: &Context, by_contact: ContactId) -> String {
+/// Stock string: `Group left.`.
+pub(crate) async fn msg_group_left(context: &Context, by_contact: ContactId) -> String {
    if by_contact == ContactId::SELF {
        translated(context, StockMessage::MsgYouLeftGroup).await
    } else {
@@ -1363,7 +1313,7 @@ impl Context {
        chat::add_device_msg(self, Some("core-welcome-image"), Some(&mut msg)).await?;

        let mut msg = Message::new(Viewtype::Text);
-        msg.text = welcome_message(self).await;
+        msg.text = Some(welcome_message(self).await);
        chat::add_device_msg(self, Some("core-welcome"), Some(&mut msg)).await?;
        Ok(())
    }
@@ -1437,7 +1387,7 @@ mod tests {
        let contact_id = Contact::create(&t.ctx, "Someone", "someone@example.org")
            .await
            .unwrap();
-        let contact = Contact::get_by_id(&t.ctx, contact_id).await.unwrap();
+        let contact = Contact::load_from_db(&t.ctx, contact_id).await.unwrap();
        // uses %1$s substitution
        assert_eq!(
            contact_verified(&t, &contact).await,
@@ -1459,11 +1409,7 @@ mod tests {
    async fn test_stock_system_msg_add_member_by_me() {
        let t = TestContext::new().await;
        assert_eq!(
-            msg_add_member_remote(&t, "alice@example.org").await,
-            "I added member alice@example.org."
-        );
-        assert_eq!(
-            msg_add_member_local(&t, "alice@example.org", ContactId::SELF).await,
+            msg_add_member(&t, "alice@example.org", ContactId::SELF).await,
            "You added member alice@example.org."
        )
    }
@@ -1475,11 +1421,7 @@ mod tests {
            .await
            .expect("failed to create contact");
        assert_eq!(
-            msg_add_member_remote(&t, "alice@example.org").await,
-            "I added member alice@example.org."
-        );
-        assert_eq!(
-            msg_add_member_local(&t, "alice@example.org", ContactId::SELF).await,
+            msg_add_member(&t, "alice@example.org", ContactId::SELF).await,
            "You added member Alice (alice@example.org)."
        );
    }
@@ -1496,7 +1438,7 @@ mod tests {
                .expect("failed to create bob")
        };
        assert_eq!(
-            msg_add_member_local(&t, "alice@example.org", contact_id,).await,
+            msg_add_member(&t, "alice@example.org", contact_id,).await,
            "Member Alice (alice@example.org) added by Bob (bob@example.com)."
        );
    }
@@ -9,6 +9,7 @@ use crate::contact::{Contact, ContactId};
 use crate::context::Context;
 use crate::message::{Message, MessageState, Viewtype};
 use crate::mimeparser::SystemMessage;
+use crate::param::Param;
 use crate::stock_str;
 use crate::tools::truncate;

@@ -132,8 +133,14 @@ impl Message {
                    append_text = false;
                    stock_str::ac_setup_msg_subject(context).await
                } else {
-                    let file_name = self
-                        .get_filename()
+                    let file_name: String = self
+                        .param
+                        .get_path(Param::File, context)
+                        .unwrap_or(None)
+                        .and_then(|path| {
+                            path.file_name()
+                                .map(|fname| fname.to_string_lossy().into_owned())
+                        })
                        .unwrap_or_else(|| String::from("ErrFileName"));
                    let label = if self.viewtype == Viewtype::Audio {
                        stock_str::audio(context).await
@@ -168,12 +175,16 @@ impl Message {
            return prefix;
        }

-        let summary_content = if self.text.is_empty() {
-            prefix
-        } else if prefix.is_empty() {
-            self.text.to_string()
+        let summary_content = if let Some(text) = &self.text {
+            if text.is_empty() {
+                prefix
+            } else if prefix.is_empty() {
+                text.to_string()
+            } else {
+                format!("{prefix} – {text}")
+            }
        } else {
-            format!("{prefix} – {}", self.text)
+            prefix
        };

        let summary = if self.is_forwarded() {
@@ -193,7 +204,6 @@ impl Message {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::param::Param;
    use crate::test_utils as test;

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -201,16 +211,19 @@ mod tests {
        let d = test::TestContext::new().await;
        let ctx = &d.ctx;

-        let some_text = " bla \t\n\tbla\n\t".to_string();
+        let some_text = Some(" bla \t\n\tbla\n\t".to_string());
+        let empty_text = Some("".to_string());
+        let no_text: Option<String> = None;

        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(some_text.to_string());
+        msg.set_text(some_text.clone());
        assert_eq!(
            msg.get_summary_text(ctx).await,
            "bla bla" // for simple text, the type is not added to the summary
        );

        let mut msg = Message::new(Viewtype::Image);
+        msg.set_text(no_text.clone());
        msg.set_file("foo.bar", None);
        assert_eq!(
            msg.get_summary_text(ctx).await,
@@ -218,6 +231,7 @@ mod tests {
        );

        let mut msg = Message::new(Viewtype::Video);
+        msg.set_text(no_text.clone());
        msg.set_file("foo.bar", None);
        assert_eq!(
            msg.get_summary_text(ctx).await,
@@ -225,6 +239,7 @@ mod tests {
        );

        let mut msg = Message::new(Viewtype::Gif);
+        msg.set_text(no_text.clone());
        msg.set_file("foo.bar", None);
        assert_eq!(
            msg.get_summary_text(ctx).await,
@@ -232,6 +247,7 @@ mod tests {
        );

        let mut msg = Message::new(Viewtype::Sticker);
+        msg.set_text(no_text.clone());
        msg.set_file("foo.bar", None);
        assert_eq!(
            msg.get_summary_text(ctx).await,
@@ -239,6 +255,7 @@ mod tests {
        );

        let mut msg = Message::new(Viewtype::Voice);
+        msg.set_text(empty_text.clone());
        msg.set_file("foo.bar", None);
        assert_eq!(
            msg.get_summary_text(ctx).await,
@@ -246,6 +263,7 @@ mod tests {
        );

        let mut msg = Message::new(Viewtype::Voice);
+        msg.set_text(no_text.clone());
        msg.set_file("foo.bar", None);
        assert_eq!(
            msg.get_summary_text(ctx).await,
@@ -261,6 +279,7 @@ mod tests {
        );

        let mut msg = Message::new(Viewtype::Audio);
+        msg.set_text(no_text.clone());
        msg.set_file("foo.bar", None);
        assert_eq!(
            msg.get_summary_text(ctx).await,
@@ -268,6 +287,7 @@ mod tests {
        );

        let mut msg = Message::new(Viewtype::Audio);
+        msg.set_text(empty_text.clone());
        msg.set_file("foo.bar", None);
        assert_eq!(
            msg.get_summary_text(ctx).await,
@@ -309,6 +329,7 @@ mod tests {
        );

        let mut msg = Message::new(Viewtype::File);
+        msg.set_text(no_text.clone());
        msg.param.set(Param::File, "foo.bar");
        msg.param.set_cmd(SystemMessage::AutocryptSetupMessage);
        assert_eq!(
@@ -130,7 +130,7 @@ impl Context {
            let mut msg = Message {
                chat_id,
                viewtype: Viewtype::Text,
-                text: stock_str::sync_msg_body(self).await,
+                text: Some(stock_str::sync_msg_body(self).await),
                hidden: true,
                subject: stock_str::sync_msg_subject(self).await,
                ..Default::default()
@@ -118,7 +118,7 @@ impl TestContextManager {
    /// - Assert that the message arrived
    pub async fn send_recv(&self, from: &TestContext, to: &TestContext, msg: &str) -> Message {
        let received_msg = self.try_send_recv(from, to, msg).await;
-        assert_eq!(received_msg.text, msg);
+        assert_eq!(received_msg.text.as_ref().unwrap(), msg);
        received_msg
    }

@@ -553,7 +553,7 @@ impl TestContext {
            Modifier::Modified => warn!(&self.ctx, "Contact {} modified by TestContext", &addr),
            Modifier::Created => warn!(&self.ctx, "Contact {} created by TestContext", &addr),
        }
-        Contact::get_by_id(&self.ctx, contact_id).await.unwrap()
+        Contact::load_from_db(&self.ctx, contact_id).await.unwrap()
    }

    /// Returns 1:1 [`Chat`] with another account, if it exists.
@@ -608,7 +608,7 @@ impl TestContext {
    /// the message.
    pub async fn send_text(&self, chat_id: ChatId, txt: &str) -> SentMessage<'_> {
        let mut msg = Message::new(Viewtype::Text);
-        msg.text = txt.to_string();
+        msg.set_text(Some(txt.to_string()));
        self.send_msg(chat_id, &mut msg).await
    }

@@ -1104,7 +1104,7 @@ async fn write_msg(context: &Context, prefix: &str, msg: &Message, buf: &mut Str
        if msg.has_location() { "📍" } else { "" },
        &contact_name,
        contact_id,
-        msgtext,
+        msgtext.unwrap_or_default(),
        if msg.get_from_id() == ContactId::SELF {
            ""
        } else if msg.get_state() == MessageState::InSeen {
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 -09-12
 -06-15