deltachat-rpc-client: fix bug in client.py and add missing EventType.MSG_DELETED

looks like this was fogotten when changing the chat protection stock strings

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     name: Lint Rust
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: 1.70.0
+      RUSTUP_TOOLCHAIN: 1.71.0
     steps:
       - uses: actions/checkout@v3
       - name: Install rustfmt and clippy
@@ -80,19 +80,15 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            rust: 1.68.2
+            rust: 1.71.0
           - os: windows-latest
-            rust: 1.68.2
+            rust: 1.71.0
           - os: macos-latest
-            rust: 1.68.2
+            rust: 1.71.0
 
-          # Minimum Supported Rust Version = 1.65.0
-          #
-          # Minimum Supported Python Version = 3.7
-          # This is the minimum version for which manylinux Python wheels are
-          # built.
+          # Minimum Supported Rust Version = 1.66.0
           - os: ubuntu-latest
-            rust: 1.65.0
+            rust: 1.66.0
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- deltachat-rpc-client: fix bug in client.py and add missing `EventType.MSG_DELETED`
+
+## [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
@@ -2628,3 +2675,6 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.113.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.9...v1.113.0
 [1.114.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.113.0...v1.114.0
 [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

CONTRIBUTING.md

@@ -76,6 +76,29 @@ If you have multiple changes in one PR, create multiple conventional commits, an
 [Conventional Commits]: https://www.conventionalcommits.org/
 [git-cliff]: https://git-cliff.org/
 
+### Errors
+
+Delta Chat core mostly uses [`anyhow`](https://docs.rs/anyhow/) errors.
+When using [`Context`](https://docs.rs/anyhow/latest/anyhow/trait.Context.html),
+capitalize it but do not add a full stop as the contexts will be separated by `:`.
+For example:
+```
+.with_context(|| format!("Unable to trash message {msg_id}"))
+```
+
+### Logging
+
+For logging, use `info!`, `warn!` and `error!` macros.
+Log messages should be capitalized and have a full stop in the end. For example:
+```
+info!(context, "Ignoring addition of {added_addr:?} to {chat_id}.");
+```
+
+Format anyhow errors with `{:#}` to print all the contexts like this:
+```
+error!(context, "Failed to set selfavatar timestamp: {err:#}.");
+```
+
 ### Reviewing
 
 Once a PR has an approval and passes CI, it can be merged.

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.117.0"
+version = "1.118.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.65"
+rust-version = "1.66"
 
 [profile.dev]
 debug = 0
@@ -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.15"
-num-derive = "0.3"
+num_cpus = "1.16"
+num-derive = "0.4"
 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.28"
+quick-xml = "0.29"
 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.24"
-strum_macros = "0.24"
+strum = "0.25"
+strum_macros = "0.25"
 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.7.3"
+testdir = "0.8.0"
 tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 pretty_assertions = "1.3.0"
 
@@ -118,11 +118,6 @@ members = [
   "format-flowed",
 ]
 
-[[example]]
-name = "simple"
-path = "examples/simple.rs"
-
-
 [[bench]]
 name = "create_account"
 harness = false

LICENSE

@@ -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 http://mozilla.org/MPL/2.0/.
+  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

RELEASE.md

@@ -4,15 +4,18 @@ For example, to release version 1.116.0 of the core, do the following steps.
 
 1. Resolve all [blocker issues](https://github.com/deltachat/deltachat-core-rust/labels/blocker).
 
-2. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
+2. Run `npm run build:core:constants` in the root of the repository
+   and commit generated `node/constants.js`, `node/events.js` and `node/lib/constants.js`.
 
-3. Update the version by running `scripts/set_core_version.py 1.116.0`.
+3. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
 
-4. Commit the changes as `chore(release): prepare for 1.116.0`.
+4. Update the version by running `scripts/set_core_version.py 1.116.0`.
+
+5. Commit the changes as `chore(release): prepare for 1.116.0`.
    Optionally, use a separate branch like `prep-1.116.0` for this commit and open a PR for review.
 
-5. Tag the release: `git tag -a v1.116.0`.
+6. Tag the release: `git tag -a v1.116.0`.
 
-6. Push the release tag: `git push origin v1.116.0`.
+7. Push the release tag: `git push origin v1.116.0`.
 
-7. Create a GitHub release: `gh release create v1.116.0 -n ''`.
+8. Create a GitHub release: `gh release create v1.116.0 -n ''`.

cliff.toml

@@ -67,9 +67,11 @@ body = """
         - {% if commit.breaking %}[**breaking**] {% endif %}\
 	{% if commit.scope %}{{ commit.scope }}: {% endif %}\
 	{{ commit.message | upper_first }}.\
-	{% for footer in commit.footers %}{% if 'BREAKING CHANGE' in footer.token %}
-	  {% raw %}  {% endraw %}- {{ footer.value }}\
-	{% endif %}{% endfor %}\
+	{% if commit.footers is defined %}\
+	  {% for footer in commit.footers %}{% if 'BREAKING CHANGE' in footer.token %}
+	    {% raw %}  {% endraw %}- {{ footer.value }}\
+	  {% endif %}{% endfor %}\
+	{% endif%}\
     {% endfor %}
 {% endfor %}\n
 """

deltachat-ffi/Cargo.toml

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

deltachat-ffi/deltachat.h

@@ -420,11 +420,11 @@ 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 (default),
+ *                    show direct replies to chats only,
  *                    DC_SHOW_EMAILS_ACCEPTED_CONTACTS (1)=
  *                    also show all mails of confirmed contacts,
  *                    DC_SHOW_EMAILS_ALL (2)=
- *                    also show mails of unconfirmed contacts.
+ *                    also show mails of unconfirmed contacts (default).
  * - `key_gen_type` = DC_KEY_GEN_DEFAULT (0)=
  *                    generate recommended key type (default),
  *                    DC_KEY_GEN_RSA2048 (1)=
@@ -485,6 +485,13 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    to not mess up with non-delivery-reports or read-receipts.
  *                    0=no limit (default).
  *                    Changes affect future messages only.
+ * - `verified_one_on_one_chats` = Feature flag for verified 1:1 chats; the UI should set it
+ *                    to 1 if it supports verified 1:1 chats.
+ *                    Regardless of this setting, `dc_chat_is_protected()` returns true while the key is verified,
+ *                    and when the key changes, an info message is posted into the chat.
+ *                    0=Nothing else happens when the key changes.
+ *                    1=After the key changed, `dc_chat_can_send()` returns false and `dc_chat_is_protection_broken()` returns true
+ *                    until `dc_accept_chat()` is called.
  * - `ui.*`         = All keys prefixed by `ui.` can be used by the user-interfaces for system-specific purposes.
  *                    The prefix should be followed by the system and maybe subsystem,
  *                    e.g. `ui.desktop.foo`, `ui.desktop.linux.bar`, `ui.android.foo`, `ui.dc40.bar`, `ui.bot.simplebot.baz`.
@@ -1470,24 +1477,6 @@ dc_array_t*     dc_get_chat_media            (dc_context_t* context, uint32_t ch
 uint32_t        dc_get_next_media            (dc_context_t* context, uint32_t msg_id, int dir, int msg_type, int msg_type2, int msg_type3);
 
 
-/**
- * Enable or disable protection against active attacks.
- * To enable protection, it is needed that all members are verified;
- * if this condition is met, end-to-end-encryption is always enabled
- * and only the verified keys are used.
- *
- * Sends out #DC_EVENT_CHAT_MODIFIED on changes
- * and #DC_EVENT_MSGS_CHANGED if a status message was sent.
- *
- * @memberof dc_context_t
- * @param context The context object as returned from dc_context_new().
- * @param chat_id The ID of the chat to change the protection for.
- * @param protect 1=protect chat, 0=unprotect chat
- * @return 1=success, 0=error, e.g. some members may be unverified
- */
-int             dc_set_chat_protection       (dc_context_t* context, uint32_t chat_id, int protect);
-
-
 /**
  * Set chat visibility to pinned, archived or normal.
  *
@@ -3712,7 +3701,6 @@ int             dc_chat_can_send              (const dc_chat_t* chat);
  * Check if a chat is protected.
  * Protected chats contain only verified members and encryption is always enabled.
  * Protected chats are created using dc_create_group_chat() by setting the 'protect' parameter to 1.
- * The status can be changed using dc_set_chat_protection().
  *
  * @memberof dc_chat_t
  * @param chat The chat object.
@@ -3721,6 +3709,26 @@ int             dc_chat_can_send              (const dc_chat_t* chat);
 int             dc_chat_is_protected         (const dc_chat_t* chat);
 
 
+/**
+ * Checks if the chat was protected, and then an incoming message broke this protection.
+ *
+ * This function is only useful if the UI enabled the `verified_one_on_one_chats` feature flag,
+ * otherwise it will return false for all chats.
+ *
+ * 1:1 chats are automatically set as protected when a contact is verified.
+ * When a message comes in that is not encrypted / signed correctly,
+ * the chat is automatically set as unprotected again.
+ * dc_chat_is_protection_broken() will return true until dc_accept_chat() is called.
+ *
+ * The UI should let the user confirm that this is OK with a message like
+ * `Bob sent a message from another device. Tap to learn more` and then call dc_accept_chat().
+ * @memberof dc_chat_t
+ * @param chat The chat object.
+ * @return 1=chat protection broken, 0=otherwise.
+ */
+int             dc_chat_is_protection_broken (const dc_chat_t* chat);
+
+
 /**
  * Check if locations are sent to the chat
  * at the time the object was created using dc_get_chat().
@@ -4315,7 +4323,7 @@ int             dc_msg_is_forwarded           (const dc_msg_t* msg);
  * Check if the message is an informational message, created by the
  * device or by another users. Such messages are not "typed" by the user but
  * created due to other actions,
- * e.g. dc_set_chat_name(), dc_set_chat_profile_image(), dc_set_chat_protection()
+ * e.g. dc_set_chat_name(), dc_set_chat_profile_image(),
  * or dc_add_contact_to_chat().
  *
  * These messages are typically shown in the center of the chat view,
@@ -5009,7 +5017,12 @@ int             dc_contact_is_verified       (dc_contact_t* contact);
 /**
  * Return the address that verified a contact
  *
- * The UI may use this in addition to a checkmark showing the verification status
+ * The UI may use this in addition to a checkmark showing the verification status.
+ * In case of verification chains,
+ * the last contact in the chain is shown.
+ * This is because of privacy reasons, but also as it would not help the user
+ * to see a unknown name here - where one can mostly always ask the shown name
+ * as it is directly known.
  *
  * @memberof dc_contact_t
  * @param contact The contact object.
@@ -6749,15 +6762,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used in error strings.
 #define DC_STR_ERROR_NO_NETWORK           87
 
-/// "Chat protection enabled."
-///
-
-/// @deprecated Deprecated, replaced by DC_STR_MSG_YOU_ENABLED_PROTECTION and DC_STR_MSG_PROTECTION_ENABLED_BY.
-#define DC_STR_PROTECTION_ENABLED         88
-
-/// @deprecated Deprecated, replaced by DC_STR_MSG_YOU_DISABLED_PROTECTION and DC_STR_MSG_PROTECTION_DISABLED_BY.
-#define DC_STR_PROTECTION_DISABLED        89
-
 /// "Reply"
 ///
 /// Used in summaries.
@@ -7202,26 +7206,6 @@ void dc_event_unref(dc_event_t* event);
 /// `%2$s` will be replaced by name and address of the contact.
 #define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER 157
 
-/// "You enabled chat protection."
-///
-/// Used in status messages.
-#define DC_STR_PROTECTION_ENABLED_BY_YOU 158
-
-/// "Chat protection enabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_PROTECTION_ENABLED_BY_OTHER 159
-
-/// "You disabled chat protection."
-#define DC_STR_PROTECTION_DISABLED_BY_YOU 160
-
-/// "Chat protection disabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-#define DC_STR_PROTECTION_DISABLED_BY_OTHER 161
-
 /// "Scan to set up second device for %1$s"
 ///
 /// `%1$s` will be replaced by name and address of the account.
@@ -7232,6 +7216,16 @@ void dc_event_unref(dc_event_t* event);
 /// Used as a device message after a successful backup transfer.
 #define DC_STR_BACKUP_TRANSFER_MSG_BODY 163
 
+/// "Messages are guaranteed to be end-to-end encrypted from now on."
+///
+/// Used in info messages.
+#define DC_STR_CHAT_PROTECTION_ENABLED 170
+
+/// "%1$s sent a message from another device."
+///
+/// Used in info messages.
+#define DC_STR_CHAT_PROTECTION_DISABLED 171
+
 /**
  * @}
  */

deltachat-ffi/src/lib.rs

@@ -1429,32 +1429,6 @@ pub unsafe extern "C" fn dc_get_next_media(
     })
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_set_chat_protection(
-    context: *mut dc_context_t,
-    chat_id: u32,
-    protect: libc::c_int,
-) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_set_chat_protection()");
-        return 0;
-    }
-    let ctx = &*context;
-    let protect = if let Some(s) = ProtectionStatus::from_i32(protect) {
-        s
-    } else {
-        warn!(ctx, "bad protect-value for dc_set_chat_protection()");
-        return 0;
-    };
-
-    block_on(async move {
-        match ChatId::new(chat_id).set_protection(ctx, protect).await {
-            Ok(()) => 1,
-            Err(_) => 0,
-        }
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_set_chat_visibility(
     context: *mut dc_context_t,
@@ -1877,13 +1851,10 @@ pub unsafe extern "C" fn dc_get_msg_info(
         return "".strdup();
     }
     let ctx = &*context;
-
-    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()
-    })
+    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()
 }
 
 #[no_mangle]
@@ -3087,6 +3058,16 @@ pub unsafe extern "C" fn dc_chat_is_protected(chat: *mut dc_chat_t) -> libc::c_i
     ffi_chat.chat.is_protected() as libc::c_int
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn dc_chat_is_protection_broken(chat: *mut dc_chat_t) -> libc::c_int {
+    if chat.is_null() {
+        eprintln!("ignoring careless call to dc_chat_is_protection_broken()");
+        return 0;
+    }
+    let ffi_chat = &*chat;
+    ffi_chat.chat.is_protection_broken() as libc::c_int
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_chat_is_sending_locations(chat: *mut dc_chat_t) -> libc::c_int {
     if chat.is_null() {
@@ -3308,7 +3289,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().unwrap_or_default().strdup()
+    ffi_msg.message.get_text().strdup()
 }
 
 #[no_mangle]
@@ -3693,7 +3674,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_opt_string_lossy(text))
+    ffi_msg.message.set_text(to_string_lossy(text))
 }
 
 #[no_mangle]

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.117.0"
+version = "1.118.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.3.0"
+tempfile = "3.6.0"
 log = "0.4"
 async-channel = { version = "1.8.0" }
 futures = { version = "0.3.28" }
-serde_json = "1.0.96"
+serde_json = "1.0.99"
 yerpc = { version = "0.5.1", features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.5", features = ["json_value"] }
-tokio = { version = "1.28.2" }
+tokio = { version = "1.29.1" }
 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.28.2", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.29.1", features = ["full", "rt-multi-thread"] }
 
 
 [features]

deltachat-jsonrpc/src/api/mod.rs

@@ -19,9 +19,7 @@ use deltachat::{
     context::get_info,
     ephemeral::Timer,
     imex, location,
-    message::{
-        self, delete_msgs, get_msg_info, markseen_msgs, Message, MessageState, MsgId, Viewtype,
-    },
+    message::{self, delete_msgs, markseen_msgs, Message, MessageState, MsgId, Viewtype},
     provider::get_provider_info,
     qr,
     qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg},
@@ -901,7 +899,7 @@ impl CommandApi {
     ) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some(text));
+        msg.set_text(text);
         let message_id =
             deltachat::chat::add_device_msg(&ctx, Some(&label), Some(&mut msg)).await?;
         Ok(message_id.to_u32())
@@ -1119,7 +1117,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?;
-        get_msg_info(&ctx, MsgId::new(message_id)).await
+        MsgId::new(message_id).get_info(&ctx).await
     }
 
     /// Returns contacts that sent read receipts and the time of reading.
@@ -1340,7 +1338,7 @@ impl CommandApi {
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
         let contact_id = ContactId::new(contact_id);
-        let contact = Contact::load_from_db(&ctx, contact_id).await?;
+        let contact = Contact::get_by_id(&ctx, contact_id).await?;
         let addr = contact.get_addr();
         Contact::create(&ctx, &name, addr).await?;
         Ok(())
@@ -1711,6 +1709,20 @@ 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,
@@ -1767,9 +1779,7 @@ impl CommandApi {
         } else {
             Viewtype::Text
         });
-        if data.text.is_some() {
-            message.set_text(data.text);
-        }
+        message.set_text(data.text.unwrap_or_default());
         if data.html.is_some() {
             message.set_html(data.html);
         }
@@ -1950,7 +1960,7 @@ impl CommandApi {
         let ctx = self.get_context(account_id).await?;
 
         let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some(text));
+        msg.set_text(text);
 
         let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
         Ok(message_id.to_u32())
@@ -1973,9 +1983,7 @@ impl CommandApi {
         } else {
             Viewtype::Text
         });
-        if text.is_some() {
-            message.set_text(text);
-        }
+        message.set_text(text.unwrap_or_default());
         if let Some(file) = file {
             message.set_file(file, None);
         }
@@ -2019,9 +2027,7 @@ impl CommandApi {
         } else {
             Viewtype::Text
         });
-        if text.is_some() {
-            draft.set_text(text);
-        }
+        draft.set_text(text.unwrap_or_default());
         if let Some(file) = file {
             draft.set_file(file, None);
         }

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

@@ -53,7 +53,7 @@ impl FullChat {
             contacts.push(
                 ContactObject::try_from_dc_contact(
                     context,
-                    Contact::load_from_db(context, *contact_id)
+                    Contact::get_by_id(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::load_from_db(context, *contact)
+                Some(contact) => Contact::get_by_id(context, *contact)
                     .await
                     .context("failed to load contact for was_seen_recently")?
                     .was_seen_recently(),

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

@@ -107,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::load_from_db(ctx, *contact)
+            Some(contact) => Contact::get_by_id(ctx, *contact)
                 .await
                 .context("contact")?
                 .was_seen_recently(),

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

@@ -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::load_from_db(context, message.get_from_id())
+        let sender_contact = Contact::get_by_id(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::load_from_db(context, quote.get_from_id())
+                    let quote_author = Contact::get_by_id(context, quote.get_from_id())
                         .await
                         .context("failed to load quote author contact")?;
                     Some(MessageQuote::WithMessage {
@@ -180,7 +180,7 @@ impl MessageObject {
             from_id: message.get_from_id().to_u32(),
             quote,
             parent_id,
-            text: message.get_text(),
+            text: Some(message.get_text()).filter(|s| !s.is_empty()),
             has_location: message.has_location(),
             has_html: message.has_html(),
             view_type: message.get_viewtype().into(),
@@ -469,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::load_from_db(context, message.get_from_id()).await?;
+        let sender = Contact::get_by_id(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()),
@@ -500,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().unwrap_or_default(),
+            message: message.get_text(),
             timestamp: message.get_timestamp(),
         })
     }

deltachat-jsonrpc/typescript/package.json

@@ -55,5 +55,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.117.0"
+  "version": "1.118.0"
 }

deltachat-repl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.117.0"
+version = "1.118.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.18"
+log = "0.4.19"
 pretty_env_logger = "0.5"
 rusqlite = "0.29"
-rustyline = "11"
+rustyline = "12"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 
 [features]

deltachat-repl/src/cmdline.rs

@@ -18,6 +18,7 @@ use deltachat::imex::*;
 use deltachat::location;
 use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
+use deltachat::mimeparser::SystemMessage;
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::reaction::send_reaction;
@@ -199,7 +200,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         if msg.has_location() { "📍" } else { "" },
         &contact_name,
         contact_id,
-        msgtext.unwrap_or_default(),
+        msgtext,
         if msg.has_html() { "[HAS-HTML]️" } else { "" },
         if msg.get_from_id() == ContactId::SELF {
             ""
@@ -210,7 +211,17 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         } else {
             "[FRESH]"
         },
-        if msg.is_info() { "[INFO]" } else { "" },
+        if msg.is_info() {
+            if msg.get_info_type() == SystemMessage::ChatProtectionEnabled {
+                "[INFO 🛡️]"
+            } else if msg.get_info_type() == SystemMessage::ChatProtectionDisabled {
+                "[INFO 🛡️❌]"
+            } else {
+                "[INFO]"
+            }
+        } else {
+            ""
+        },
         if msg.get_viewtype() == Viewtype::VideochatInvitation {
             format!(
                 "[VIDEOCHAT-INVITATION: {}, type={}]",
@@ -395,8 +406,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  unpin <chat-id>\n\
                  mute <chat-id> [<seconds>]\n\
                  unmute <chat-id>\n\
-                 protect <chat-id>\n\
-                 unprotect <chat-id>\n\
                  delchat <chat-id>\n\
                  accept <chat-id>\n\
                  decline <chat-id>\n\
@@ -912,9 +921,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 Viewtype::File
             });
             msg.set_file(arg1, None);
-            if !arg2.is_empty() {
-                msg.set_text(Some(arg2.to_string()));
-            }
+            msg.set_text(arg2.to_string());
             chat::send_msg(&context, sel_chat.as_ref().unwrap().get_id(), &mut msg).await?;
         }
         "sendhtml" => {
@@ -926,11 +933,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(Some(if arg2.is_empty() {
+            msg.set_text(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? {
@@ -979,7 +986,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(Some(arg1.to_string()));
+                draft.set_text(arg1.to_string());
                 sel_chat
                     .as_ref()
                     .unwrap()
@@ -1003,7 +1010,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(Some(arg1.to_string()));
+            msg.set_text(arg1.to_string());
             chat::add_device_msg(&context, None, Some(&mut msg)).await?;
         }
         "listmedia" => {
@@ -1058,20 +1065,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             };
             chat::set_muted(&context, chat_id, duration).await?;
         }
-        "protect" | "unprotect" => {
-            ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
-            let chat_id = ChatId::new(arg1.parse()?);
-            chat_id
-                .set_protection(
-                    &context,
-                    match arg0 {
-                        "protect" => ProtectionStatus::Protected,
-                        "unprotect" => ProtectionStatus::Unprotected,
-                        _ => unreachable!("arg0={:?}", arg0),
-                    },
-                )
-                .await?;
-        }
         "delchat" => {
             ensure!(!arg1.is_empty(), "Argument <chat-id> missing.");
             let chat_id = ChatId::new(arg1.parse()?);
@@ -1090,7 +1083,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 = message::get_msg_info(&context, id).await?;
+            let res = id.get_info(&context).await?;
             println!("{res}");
         }
         "download" => {

deltachat-rpc-client/LICENSE

@@ -0,0 +1,373 @@
+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.

deltachat-rpc-client/pyproject.toml

@@ -9,6 +9,21 @@ dependencies = [
     "aiohttp",
     "aiodns"
 ]
+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"
+]
 dynamic = [
     "version"
 ]

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

@@ -259,3 +259,11 @@ 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)

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

@@ -155,7 +155,7 @@ class Client:
 
     async def _on_new_msg(self, snapshot: AttrDict) -> None:
         event = AttrDict(command="", payload="", message_snapshot=snapshot)
-        if not snapshot.is_info and snapshot.text.startswith(COMMAND_PREFIX):
+        if not snapshot.is_info and (snapshot.text or "").startswith(COMMAND_PREFIX):
             await self._parse_command(event)
         await self._on_event(event, NewMessage)
 

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

@@ -45,6 +45,7 @@ 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"

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

@@ -16,9 +16,8 @@ async def get_temp_credentials() -> dict:
 
     # Replace default 5 minute timeout with a 1 minute timeout.
     timeout = aiohttp.ClientTimeout(total=60)
-    async with aiohttp.ClientSession() as session:
-        async with session.post(url, timeout=timeout) as response:
-            return json.loads(await response.text())
+    async with aiohttp.ClientSession() as session, session.post(url, timeout=timeout) as response:
+        return json.loads(await response.text())
 
 
 class ACFactory:

deltachat-rpc-client/tests/test_something.py

@@ -335,3 +335,13 @@ 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])

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.117.0"
+version = "1.118.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.96"
+serde_json = "1.0.99"
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.28.2", features = ["io-std"] }
+tokio = { version = "1.29.1", features = ["io-std"] }
 tokio-util = "0.7.8"
 yerpc = { version = "0.5.1", features = ["anyhow_expose"] }
 

deny.toml

@@ -10,6 +10,7 @@ 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" },
@@ -24,9 +25,11 @@ skip = [
      { name = "ed25519-dalek", version = "1.0.1" },
      { name = "ed25519", version = "1.5.3" },
      { name = "getrandom", version = "<0.2" },
-     { name = "hermit-abi", version = "<0.3" },
+     { name = "hashbrown", version = "<0.14.0" },
      { name = "idna", version = "<0.3" },
-     { name = "libm", version = "0.1.4" },
+     { name = "indexmap", version = "<2.0.0" },
+     { name = "linux-raw-sys", version = "0.3.8" },
+     { name = "num-derive", version = "0.3.3" },
      { name = "pem-rfc7468", version = "0.6.0" },
      { name = "pkcs8", version = "0.9.0" },
      { name = "quick-error", version = "<2.0" },
@@ -35,9 +38,11 @@ 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" },
@@ -50,8 +55,10 @@ 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" },
 ]
 
 

examples/simple.rs

@@ -1,100 +0,0 @@
-use deltachat::chat::{self, ChatId};
-use deltachat::chatlist::*;
-use deltachat::config;
-use deltachat::contact::*;
-use deltachat::context::*;
-use deltachat::message::Message;
-use deltachat::stock_str::StockStrings;
-use deltachat::{EventType, Events};
-use tempfile::tempdir;
-
-fn cb(event: EventType) {
-    match event {
-        EventType::ConfigureProgress { progress, .. } => {
-            log::info!("progress: {}", progress);
-        }
-        EventType::Info(msg) => {
-            log::info!("{}", msg);
-        }
-        EventType::Warning(msg) => {
-            log::warn!("{}", msg);
-        }
-        EventType::Error(msg) => {
-            log::error!("{}", msg);
-        }
-        event => {
-            log::info!("{:?}", event);
-        }
-    }
-}
-
-/// Run with `RUST_LOG=simple=info cargo run --release --example simple -- email pw`.
-#[tokio::main]
-async fn main() {
-    pretty_env_logger::try_init_timed().ok();
-
-    let dir = tempdir().unwrap();
-    let dbfile = dir.path().join("db.sqlite");
-    log::info!("creating database {:?}", dbfile);
-    let ctx = Context::new(&dbfile, 0, Events::new(), StockStrings::new())
-        .await
-        .expect("Failed to create context");
-    let info = ctx.get_info().await;
-    log::info!("info: {:#?}", info);
-
-    let events = ctx.get_event_emitter();
-    let events_spawn = tokio::task::spawn(async move {
-        while let Some(event) = events.recv().await {
-            cb(event.typ);
-        }
-    });
-
-    log::info!("configuring");
-    let args = std::env::args().collect::<Vec<String>>();
-    assert_eq!(args.len(), 3, "requires email password");
-    let email = args[1].clone();
-    let pw = args[2].clone();
-    ctx.set_config(config::Config::Addr, Some(&email))
-        .await
-        .unwrap();
-    ctx.set_config(config::Config::MailPw, Some(&pw))
-        .await
-        .unwrap();
-
-    ctx.configure().await.unwrap();
-
-    log::info!("------ RUN ------");
-    ctx.start_io().await;
-    log::info!("--- SENDING A MESSAGE ---");
-
-    let contact_id = Contact::create(&ctx, "dignifiedquire", "dignifiedquire@gmail.com")
-        .await
-        .unwrap();
-    let chat_id = ChatId::create_for_contact(&ctx, contact_id).await.unwrap();
-
-    for i in 0..1 {
-        log::info!("sending message {}", i);
-        chat::send_text_msg(&ctx, chat_id, format!("Hi, here is my {i}nth message!"))
-            .await
-            .unwrap();
-    }
-
-    // wait for the message to be sent out
-    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-
-    log::info!("fetching chats..");
-    let chats = Chatlist::try_load(&ctx, 0, None, None).await.unwrap();
-
-    for i in 0..chats.len() {
-        let msg = Message::load_from_db(&ctx, chats.get_msg_id(i).unwrap().unwrap())
-            .await
-            .unwrap();
-        log::info!("[{}] msg: {:?}", i, msg);
-    }
-
-    log::info!("stopping");
-    ctx.stop_io().await;
-    log::info!("closing");
-    drop(ctx);
-    events_spawn.await.unwrap();
-}

fuzz/Cargo.lock

@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
 [[package]]
 name = "abao"
 version = "0.2.0"
@@ -60,19 +54,13 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "aliasable"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
-
 [[package]]
 name = "alloc-no-stdlib"
 version = "2.0.4"
@@ -189,12 +177,11 @@ dependencies = [
 
 [[package]]
 name = "async-imap"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8379e2f1cdeb79afd2006932d7e8f64993fc0f7386d0ebc37231c90b05968c25"
+checksum = "da93622739d458dd9a6abc1abf0e38e81965a5824a3b37f9500437c82a8bb572"
 dependencies = [
  "async-channel",
- "async-native-tls 0.4.0",
  "base64 0.21.0",
  "byte-pool",
  "chrono",
@@ -203,25 +190,13 @@ dependencies = [
  "log",
  "nom",
  "once_cell",
- "ouroboros",
  "pin-utils",
+ "self_cell",
  "stop-token",
  "thiserror",
  "tokio",
 ]
 
-[[package]]
-name = "async-native-tls"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
-dependencies = [
- "native-tls",
- "thiserror",
- "tokio",
- "url",
-]
-
 [[package]]
 name = "async-native-tls"
 version = "0.5.0"
@@ -556,9 +531,9 @@ checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
 
 [[package]]
 name = "byte-pool"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca"
+checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158"
 dependencies = [
  "crossbeam-queue",
  "stable_deref_trait",
@@ -951,12 +926,12 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.112.6"
+version = "1.117.0"
 dependencies = [
  "anyhow",
  "async-channel",
  "async-imap",
- "async-native-tls 0.5.0",
+ "async-native-tls",
  "async-smtp",
  "async_zip",
  "backtrace",
@@ -979,6 +954,7 @@ dependencies = [
  "lettre_email",
  "libc",
  "mailparse 0.14.0",
+ "mime",
  "num-derive",
  "num-traits",
  "num_cpus",
@@ -1244,7 +1220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
 dependencies = [
  "serde",
- "signature 1.6.4",
+ "signature 2.1.0",
 ]
 
 [[package]]
@@ -1701,9 +1677,9 @@ checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
 
 [[package]]
 name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -2397,9 +2373,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "mime"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minimal-lexical"
@@ -2651,9 +2627,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "opaque-debug"
@@ -2663,9 +2639,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.48"
+version = "0.10.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
@@ -2704,11 +2680,10 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.83"
+version = "0.9.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
 dependencies = [
- "autocfg",
  "cc",
  "libc",
  "openssl-src",
@@ -2716,29 +2691,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "ouroboros"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbb50b356159620db6ac971c6d5c9ab788c9cc38a6f49619fca2a27acb062ca"
-dependencies = [
- "aliasable",
- "ouroboros_macro",
-]
-
-[[package]]
-name = "ouroboros_macro"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d"
-dependencies = [
- "Inflector",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -2865,9 +2817,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pgp"
@@ -3316,13 +3268,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.7.2",
 ]
 
 [[package]]
@@ -3331,7 +3283,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.28",
 ]
 
 [[package]]
@@ -3341,10 +3293,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
-name = "reqwest"
-version = "0.11.16"
+name = "regex-syntax"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+
+[[package]]
+name = "reqwest"
+version = "0.11.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
 dependencies = [
  "base64 0.21.0",
  "bytes",
@@ -3690,6 +3648,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "self_cell"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6"
+
 [[package]]
 name = "semver"
 version = "1.0.17"
@@ -4249,9 +4213,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -4275,9 +4239,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
 dependencies = [
  "bytes",
  "futures-core",

node/constants.js

@@ -158,6 +158,8 @@ module.exports = {
   DC_STR_BROADCAST_LIST: 115,
   DC_STR_CANNOT_LOGIN: 60,
   DC_STR_CANTDECRYPT_MSG_BODY: 29,
+  DC_STR_CHAT_PROTECTION_DISABLED: 171,
+  DC_STR_CHAT_PROTECTION_ENABLED: 170,
   DC_STR_CONFIGURATION_FAILED: 84,
   DC_STR_CONNECTED: 107,
   DC_STR_CONNTECTING: 108,
@@ -243,12 +245,6 @@ module.exports = {
   DC_STR_OUTGOING_MESSAGES: 104,
   DC_STR_PARTIAL_DOWNLOAD_MSG_BODY: 99,
   DC_STR_PART_OF_TOTAL_USED: 116,
-  DC_STR_PROTECTION_DISABLED: 89,
-  DC_STR_PROTECTION_DISABLED_BY_OTHER: 161,
-  DC_STR_PROTECTION_DISABLED_BY_YOU: 160,
-  DC_STR_PROTECTION_ENABLED: 88,
-  DC_STR_PROTECTION_ENABLED_BY_OTHER: 159,
-  DC_STR_PROTECTION_ENABLED_BY_YOU: 158,
   DC_STR_QUOTA_EXCEEDING_MSG_BODY: 98,
   DC_STR_READRCPT: 31,
   DC_STR_READRCPT_MAILBODY: 32,

node/lib/constants.ts

@@ -158,6 +158,8 @@ export enum C {
   DC_STR_BROADCAST_LIST = 115,
   DC_STR_CANNOT_LOGIN = 60,
   DC_STR_CANTDECRYPT_MSG_BODY = 29,
+  DC_STR_CHAT_PROTECTION_DISABLED = 171,
+  DC_STR_CHAT_PROTECTION_ENABLED = 170,
   DC_STR_CONFIGURATION_FAILED = 84,
   DC_STR_CONNECTED = 107,
   DC_STR_CONNTECTING = 108,
@@ -243,12 +245,6 @@ export enum C {
   DC_STR_OUTGOING_MESSAGES = 104,
   DC_STR_PARTIAL_DOWNLOAD_MSG_BODY = 99,
   DC_STR_PART_OF_TOTAL_USED = 116,
-  DC_STR_PROTECTION_DISABLED = 89,
-  DC_STR_PROTECTION_DISABLED_BY_OTHER = 161,
-  DC_STR_PROTECTION_DISABLED_BY_YOU = 160,
-  DC_STR_PROTECTION_ENABLED = 88,
-  DC_STR_PROTECTION_ENABLED_BY_OTHER = 159,
-  DC_STR_PROTECTION_ENABLED_BY_YOU = 158,
   DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
   DC_STR_READRCPT = 31,
   DC_STR_READRCPT_MAILBODY = 32,

node/lib/context.ts

@@ -699,23 +699,6 @@ export class Context extends EventEmitter {
     )
   }
 
-  /**
-   *
-   * @param chatId
-   * @param protect
-   * @returns success boolean
-   */
-  setChatProtection(chatId: number, protect: boolean) {
-    debug(`setChatProtection ${chatId} ${protect}`)
-    return Boolean(
-      binding.dcn_set_chat_protection(
-        this.dcn_context,
-        Number(chatId),
-        protect ? 1 : 0
-      )
-    )
-  }
-
   getChatEphemeralTimer(chatId: number): number {
     debug(`getChatEphemeralTimer ${chatId}`)
     return binding.dcn_get_chat_ephemeral_timer(

node/src/module.c

@@ -1399,18 +1399,6 @@ NAPI_METHOD(dcn_set_chat_name) {
   NAPI_RETURN_INT32(result);
 }
 
-NAPI_METHOD(dcn_set_chat_protection) {
-  NAPI_ARGV(3);
-  NAPI_DCN_CONTEXT();
-  NAPI_ARGV_UINT32(chat_id, 1);
-  NAPI_ARGV_INT32(protect, 1);
-
-  int result = dc_set_chat_protection(dcn_context->dc_context,
-                                      chat_id,
-                                      protect);
-  NAPI_RETURN_INT32(result);
-}
-
 NAPI_METHOD(dcn_get_chat_ephemeral_timer) {
   NAPI_ARGV(2);
   NAPI_DCN_CONTEXT();
@@ -3491,7 +3479,6 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(dcn_send_msg);
   NAPI_EXPORT_FUNCTION(dcn_send_videochat_invitation);
   NAPI_EXPORT_FUNCTION(dcn_set_chat_name);
-  NAPI_EXPORT_FUNCTION(dcn_set_chat_protection);
   NAPI_EXPORT_FUNCTION(dcn_get_chat_ephemeral_timer);
   NAPI_EXPORT_FUNCTION(dcn_set_chat_ephemeral_timer);
   NAPI_EXPORT_FUNCTION(dcn_set_chat_profile_image);

package.json

@@ -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.117.0"
+  "version": "1.118.0"
 }

python/LICENSE

@@ -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 http://mozilla.org/MPL/2.0/.
+  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

python/doc/api.rst

@@ -2,34 +2,34 @@
 high level API reference
 ========================
 
-- :class:`deltachat.account.Account` (your main entry point, creates the
+- :class:`deltachat.Account` (your main entry point, creates the
   other classes)
-- :class:`deltachat.contact.Contact`
-- :class:`deltachat.chat.Chat`
-- :class:`deltachat.message.Message`
+- :class:`deltachat.Contact`
+- :class:`deltachat.Chat`
+- :class:`deltachat.Message`
 
 Account
 -------
 
-.. autoclass:: deltachat.account.Account
+.. autoclass:: deltachat.Account
     :members:
 
 
 Contact
 -------
 
-.. autoclass:: deltachat.contact.Contact
+.. autoclass:: deltachat.Contact
     :members:
 
 Chat
 ----
 
-.. autoclass:: deltachat.chat.Chat
+.. autoclass:: deltachat.Chat
     :members:
 
 Message
 -------
 
-.. autoclass:: deltachat.message.Message
+.. autoclass:: deltachat.Message
     :members:
 

python/examples/group_tracking.py

@@ -32,25 +32,13 @@ class GroupTrackingPlugin:
 
     @account_hookimpl
     def ac_member_added(self, chat, contact, actor, message):
-        print(
-            "ac_member_added {} to chat {} from {}".format(
-                contact.addr,
-                chat.id,
-                actor or message.get_sender_contact().addr,
-            ),
-        )
+        print(f"ac_member_added {contact.addr} to chat {chat.id} from {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(
-            "ac_member_removed {} from chat {} by {}".format(
-                contact.addr,
-                chat.id,
-                actor or message.get_sender_contact().addr,
-            ),
-        )
+        print(f"ac_member_removed {contact.addr} from chat {chat.id} by {actor or message.get_sender_contact().addr}")
 
 
 def main(argv=None):

python/examples/test_examples.py

@@ -24,8 +24,6 @@ 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()
@@ -54,8 +52,6 @@ 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")

python/pyproject.toml

@@ -11,10 +11,11 @@ authors = [
     { name = "holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors" },
 ]
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "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",
 ]

python/src/deltachat/account.py

@@ -6,7 +6,7 @@ from array import array
 from contextlib import contextmanager
 from email.utils import parseaddr
 from threading import Event
-from typing import Any, Dict, Generator, List, Optional, Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Union
 
 from . import const, hookspec
 from .capi import ffi, lib

python/src/deltachat/events.py

@@ -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={}):

python/src/deltachat/message.py

@@ -486,6 +486,9 @@ 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
 

python/src/deltachat/testplugin.py

@@ -9,7 +9,7 @@ import threading
 import time
 import weakref
 from queue import Queue
-from typing import Callable, List, Optional, Dict, Set
+from typing import Callable, Dict, List, Optional, Set
 
 import pytest
 import requests
@@ -682,13 +682,6 @@ 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):

python/src/deltachat/tracker.py

@@ -1,6 +1,6 @@
 from queue import Queue
 from threading import Event
-from typing import List, TYPE_CHECKING
+from typing import TYPE_CHECKING, List
 
 from .hookspec import Global, account_hookimpl
 

python/tests/test_1_online.py

@@ -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
 
-from deltachat import const
-from deltachat.hookspec import account_hookimpl
-from deltachat.message import Message
+import deltachat as dc
+from deltachat import account_hookimpl, 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(const.DC_KEY_GEN_RSA2048))
-    ac2 = acfactory.new_online_configuring_account(key_gen_type=str(const.DC_KEY_GEN_ED25519))
+    ac1 = acfactory.new_online_configuring_account(key_gen_type=str(dc.const.DC_KEY_GEN_RSA2048))
+    ac2 = acfactory.new_online_configuring_account(key_gen_type=str(dc.const.DC_KEY_GEN_ED25519))
     acfactory.bring_accounts_online()
     chat = acfactory.get_accepted_chat(ac1, ac2)
 
@@ -175,7 +175,7 @@ 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 > const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev.data2 > dc.const.DC_CHAT_ID_LAST_SPECIAL
         return ac2.get_message_by_id(ev.data2)
 
     msg = send_and_receive_message()
@@ -207,7 +207,7 @@ 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 > const.DC_CHAT_ID_LAST_SPECIAL
+    assert ev.data2 > dc.const.DC_CHAT_ID_LAST_SPECIAL
     msg = ac2.get_message_by_id(ev.data2)
 
     assert open(msg.filename).read() == content
@@ -324,6 +324,33 @@ def test_webxdc_message(acfactory, data, lp):
     assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True)))) == 1
 
 
+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()
+
+
 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)
@@ -351,7 +378,42 @@ def test_move_works(acfactory):
 
     # Message is downloaded
     ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
-    assert ev.data2 > const.DC_CHAT_ID_LAST_SPECIAL
+    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
 
 
 def test_move_works_on_self_sent(acfactory):
@@ -534,8 +596,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 > const.DC_CHAT_ID_LAST_SPECIAL
-        assert ev.data2 > const.DC_MSG_ID_LAST_SPECIAL
+        assert ev.data1 > dc.const.DC_CHAT_ID_LAST_SPECIAL
+        assert ev.data2 > dc.const.DC_MSG_ID_LAST_SPECIAL
     lp.step("2")
 
     # Check that ac1 marks the read receipt as read.
@@ -1386,7 +1448,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 == const.DC_DOWNLOAD_AVAILABLE
+    assert msg2.download_state == dc.const.DC_DOWNLOAD_AVAILABLE
     assert reactions_queue.get() == msg2
     reactions = msg2.get_reactions()
     contacts = reactions.get_contacts()
@@ -1471,7 +1533,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), const.DC_IMEX_EXPORT_BACKUP)
+        ac1.imex(str(backupdir), dc.const.DC_IMEX_EXPORT_BACKUP)
 
         # check progress events for export
         assert imex_tracker.wait_progress(1, progress_upper_limit=249)
@@ -1835,15 +1897,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(const.DC_CONNECTIVITY_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_CONNECTED)
 
     lp.sec("Test stop_io() and start_io()")
     ac1.stop_io()
-    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_NOT_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
 
     ac1.start_io()
-    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_CONNECTING)
-    ac1._evtracker.wait_for_connectivity_change(const.DC_CONNECTIVITY_CONNECTING, const.DC_CONNECTIVITY_CONNECTED)
+    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)
 
     lp.sec(
         "Test that after calling start_io(), maybe_network() and waiting for `all_work_done()`, "
@@ -1864,8 +1926,8 @@ def test_connectivity(acfactory, lp):
 
     ac2.create_chat(ac1).send_text("Hi 2")
 
-    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)
+    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)
 
     msgs = ac1.create_chat(ac2).get_messages()
     assert len(msgs) == 2
@@ -1875,7 +1937,7 @@ def test_connectivity(acfactory, lp):
 
     ac1.maybe_network()
     while 1:
-        assert ac1.get_connectivity() == const.DC_CONNECTIVITY_CONNECTED
+        assert ac1.get_connectivity() == dc.const.DC_CONNECTIVITY_CONNECTED
         if ac1.all_work_done():
             break
         ac1._evtracker.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")
@@ -1890,7 +1952,7 @@ def test_connectivity(acfactory, lp):
     ac1.maybe_network()
 
     while 1:
-        assert ac1.get_connectivity() == const.DC_CONNECTIVITY_CONNECTED
+        assert ac1.get_connectivity() == dc.const.DC_CONNECTIVITY_CONNECTED
         if ac1.all_work_done():
             break
         ac1._evtracker.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")
@@ -1899,10 +1961,10 @@ def test_connectivity(acfactory, lp):
 
     ac1.set_config("configured_mail_pw", "abc")
     ac1.stop_io()
-    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_NOT_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
     ac1.start_io()
-    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_CONNECTING)
-    ac1._evtracker.wait_for_connectivity(const.DC_CONNECTIVITY_NOT_CONNECTED)
+    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_CONNECTING)
+    ac1._evtracker.wait_for_connectivity(dc.const.DC_CONNECTIVITY_NOT_CONNECTED)
 
 
 def test_fetch_deleted_msg(acfactory, lp):
@@ -2385,9 +2447,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 == const.DC_CHAT_ID_ARCHIVED_LINK:
+        if ev.data1 == dc.const.DC_CHAT_ID_ARCHIVED_LINK:
             assert ev.data2 == 0
-            archive = ac2.get_chat_by_id(const.DC_CHAT_ID_ARCHIVED_LINK)
+            archive = ac2.get_chat_by_id(dc.const.DC_CHAT_ID_ARCHIVED_LINK)
             assert archive.count_fresh_messages() == 1
             assert chat2.count_fresh_messages() == 1
             break

python/tests/test_3_offline.py

@@ -4,12 +4,11 @@ from datetime import datetime, timedelta, timezone
 
 import pytest
 
-from deltachat import Account, const
+import deltachat as dc
 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(
@@ -299,13 +298,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(const.DC_STR_GROUP_NAME_CHANGED_BY_YOU, "abc %1$s xyz %2$s")
+        ac1.set_stock_translation(dc.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(const.DC_STR_FILE, "xyz %1$s")
+            ac1.set_stock_translation(dc.const.DC_STR_FILE, "xyz %1$s")
         ac1._evtracker.get_matching("DC_EVENT_WARNING")
         with pytest.raises(ValueError):
-            ac1.set_stock_translation(const.DC_STR_CONTACT_NOT_VERIFIED, "xyz %2$s")
+            ac1.set_stock_translation(dc.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")
@@ -481,6 +480,19 @@ 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")
@@ -805,7 +817,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, const.DC_GCM_INFO_ONLY, 0),
+            lib.dc_get_chat_msgs(ac1._dc_context, chat.id, dc.const.DC_GCM_INFO_ONLY, 0),
             lib.dc_array_unref,
         )
         assert len(list(iter_array(dc_array, lambda x: x))) == 2

python/tests/test_4_lowlevel.py

@@ -1,6 +1,7 @@
 from queue import Queue
 
-from deltachat import capi, const, cutil, register_global_plugin
+import deltachat as dc
+from deltachat import capi, cutil, register_global_plugin
 from deltachat.capi import ffi, lib
 from deltachat.hookspec import global_hookimpl
 from deltachat.testplugin import (
@@ -132,20 +133,20 @@ def test_empty_blobdir(tmp_path):
 
 
 def test_event_defines():
-    assert const.DC_EVENT_INFO == 100
-    assert const.DC_CONTACT_ID_SELF
+    assert dc.const.DC_EVENT_INFO == 100
+    assert dc.const.DC_CONTACT_ID_SELF
 
 
 def test_sig():
     sig = capi.lib.dc_event_has_string_data
-    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)
+    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)
 
 
 def test_markseen_invalid_message_ids(acfactory):

release-date.in

@@ -1 +1 @@
-2023-06-15
+2023-07-07

scripts/README.md

@@ -18,6 +18,10 @@ and an own build machine.
 - `remote_tests_rust.sh` rsyncs to the build machine and runs
   `run-rust-test.sh` remotely on the build machine. 
 
+- `make-python-testenv.sh` creates or updates local python test development environment.
+  Reusing the same environment is faster than running `run-python-test.sh` which always
+  recreates environment from scratch and runs additional lints.
+
 - `run-doxygen.sh` generates C-docs which are then uploaded to https://c.delta.chat/
 
 - `run_all.sh` builds Python wheels

scripts/concourse/docs_wheels.yml

@@ -225,7 +225,7 @@ jobs:
               - -ec
               - |
                 apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
+                apt-get install -y --no-install-recommends python3-pip python3-setuptools python3-venv
                 python3 -m venv env
                 env/bin/pip install --upgrade pip
                 env/bin/pip install devpi
@@ -297,7 +297,7 @@ jobs:
               - -ec
               - |
                 apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
+                apt-get install -y --no-install-recommends python3-pip python3-setuptools python3-venv
                 python3 -m venv env
                 env/bin/pip install --upgrade pip
                 env/bin/pip install devpi
@@ -369,7 +369,7 @@ jobs:
               - -ec
               - |
                 apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
+                apt-get install -y --no-install-recommends python3-pip python3-setuptools python3-venv
                 python3 -m venv env
                 env/bin/pip install --upgrade pip
                 env/bin/pip install devpi

scripts/make-python-testenv.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Script to create or update a python development environment.
+# It rebuilds the core and bindings as needed.
+#
+# After running the script, you can either
+# run `pytest` directly with `env/bin/pytest python/`
+# or activate the environment with `. env/bin/activacte`
+# and run `pytest` from there.
+set -euo pipefail
+
+export DCC_RS_TARGET=debug
+export DCC_RS_DEV="$PWD"
+cargo build -p deltachat_ffi --features jsonrpc
+
+if test -d env; then
+	env/bin/pip install -e python --force-reinstall
+else
+	tox -e py --devenv env
+	env/bin/pip install --upgrade pip
+fi

scripts/zig-musl-check.sh

@@ -9,7 +9,7 @@ set -e
 unset RUSTFLAGS
 
 # Pin Rust version to avoid uncontrolled changes in the compiler and linker flags.
-export RUSTUP_TOOLCHAIN=1.70.0
+export RUSTUP_TOOLCHAIN=1.71.0
 
 ZIG_VERSION=0.11.0-dev.2213+515e1c93e
 

scripts/zig-rpc-server.sh

@@ -8,7 +8,7 @@ set -e
 unset RUSTFLAGS
 
 # Pin Rust version to avoid uncontrolled changes in the compiler and linker flags.
-export RUSTUP_TOOLCHAIN=1.70.0
+export RUSTUP_TOOLCHAIN=1.71.0
 
 ZIG_VERSION=0.11.0-dev.2213+515e1c93e
 

src/authres.rs

@@ -357,7 +357,6 @@ 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;
@@ -705,7 +704,7 @@ Authentication-Results: dkim=";
         let received = tcm
             .try_send_recv(&alice, &bob2, "My credit card number is 1234")
             .await;
-        assert!(!received.text.as_ref().unwrap().contains("1234"));
+        assert!(!received.text.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.");
@@ -786,7 +785,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.unwrap(), "hellooo in the mailinglist again");
+        assert_eq!(&rcvd.text, "hellooo in the mailinglist again");
 
         Ok(())
     }
@@ -825,7 +824,9 @@ Authentication-Results: dkim=";
         // Disallowing keychanges is disabled for now:
         // assert!(rcvd.error.unwrap().contains("DKIM failed"));
         // The message info should contain a warning:
-        assert!(message::get_msg_info(&bob, rcvd.id)
+        assert!(rcvd
+            .id
+            .get_info(&bob)
             .await
             .unwrap()
             .contains("KEYCHANGES NOT ALLOWED"));

src/chatlist.rs

@@ -319,7 +319,7 @@ impl Chatlist {
             } else {
                 match chat.typ {
                     Chattype::Group | Chattype::Broadcast | Chattype::Mailinglist => {
-                        let lastcontact = Contact::load_from_db(context, lastmsg.from_id)
+                        let lastcontact = Contact::get_by_id(context, lastmsg.from_id)
                             .await
                             .context("loading contact failed")?;
                         (Some(lastmsg), Some(lastcontact))
@@ -424,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(Some("hello".to_string()));
+            msg.set_text("hello".to_string());
             chat_id.set_draft(&t, Some(&mut msg)).await.unwrap();
         }
 
@@ -636,7 +636,7 @@ mod tests {
             .unwrap();
 
         let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some("foo:\nbar \r\n test".to_string()));
+        msg.set_text("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();

src/config.rs

@@ -311,6 +311,16 @@ pub enum Config {
 
     /// Last message processed by the bot.
     LastMsgId,
+
+    /// Feature flag for verified 1:1 chats; the UI should set it
+    /// to 1 if it supports verified 1:1 chats.
+    /// Regardless of this setting, `chat.is_protected()` returns true while the key is verified,
+    /// and when the key changes, an info message is posted into the chat.
+    /// 0=Nothing else happens when the key changes.
+    /// 1=After the key changed, `can_send()` returns false and `is_protection_broken()` returns true
+    /// until `chat_id.accept()` is called.
+    #[strum(props(default = "0"))]
+    VerifiedOneOnOneChats,
 }
 
 impl Context {

src/configure.rs

@@ -131,7 +131,7 @@ async fn on_configure_completed(
 ) -> Result<()> {
     if let Some(provider) = param.provider {
         if let Some(config_defaults) = &provider.config_defaults {
-            for def in config_defaults.iter() {
+            for def in config_defaults {
                 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 = Some(provider.after_login_hint.to_string());
+            msg.text = 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 =
-                    Some(stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await);
+                    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 mut server in &mut servers {
+    for server in &mut servers {
         let certificate_checks = match server.protocol {
             Protocol::Imap => param.imap.certificate_checks,
             Protocol::Smtp => param.smtp.certificate_checks,
@@ -462,9 +462,12 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
 
     progress!(ctx, 910);
 
-    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?;
+    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?;
+        }
     }
 
     // the trailing underscore is correct
@@ -653,7 +656,7 @@ async fn try_smtp_one_param(
         })
     } else {
         info!(context, "success: {}", inf);
-        smtp.disconnect().await;
+        smtp.disconnect();
         Ok(())
     }
 }

src/configure/auto_mozilla.rs

@@ -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.into_iter())
+        .chain(moz_ac.outgoing_servers)
         .filter_map(|server| {
             let protocol = match server.typ.as_ref() {
                 "imap" => Some(Protocol::Imap),

src/contact.rs

@@ -338,11 +338,33 @@ impl Default for VerifiedStatus {
 }
 
 impl Contact {
-    /// Loads a contact snapshot from the database.
-    pub async fn load_from_db(context: &Context, contact_id: ContactId) -> Result<Self> {
-        let mut contact = context
+    /// 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
             .sql
-            .query_row(
+            .query_row_optional(
                 "SELECT c.name, c.addr, c.origin, c.blocked, c.last_seen,
                 c.authname, c.param, c.status
                FROM contacts c
@@ -371,23 +393,27 @@ 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;
+            .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)
         }
-        Ok(contact)
     }
 
     /// Returns `true` if this contact is blocked.
@@ -407,7 +433,13 @@ impl Contact {
 
     /// Check if a contact is blocked.
     pub async fn is_blocked_load(context: &Context, id: ContactId) -> Result<bool> {
-        let blocked = Self::load_from_db(context, id).await?.blocked;
+        let blocked = context
+            .sql
+            .query_row("SELECT blocked FROM contacts WHERE id=?", (id,), |row| {
+                let blocked: bool = row.get(0)?;
+                Ok(blocked)
+            })
+            .await?;
         Ok(blocked)
     }
 
@@ -959,7 +991,7 @@ impl Contact {
         );
 
         let mut ret = String::new();
-        if let Ok(contact) = Contact::load_from_db(context, contact_id).await {
+        if let Ok(contact) = Contact::get_by_id(context, contact_id).await {
             let loginparam = LoginParam::load_configured_params(context).await?;
             let peerstate = Peerstate::from_addr(context, &contact.addr).await?;
 
@@ -1046,17 +1078,6 @@ 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
@@ -1120,11 +1141,29 @@ 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 {
@@ -1317,7 +1356,7 @@ async fn set_block_contact(
         contact_id
     );
 
-    let contact = Contact::load_from_db(context, contact_id).await?;
+    let contact = Contact::get_by_id(context, contact_id).await?;
 
     if contact.blocked != new_blocking {
         context
@@ -1379,7 +1418,7 @@ pub(crate) async fn set_profile_image(
     profile_image: &AvatarAction,
     was_encrypted: bool,
 ) -> Result<()> {
-    let mut contact = Contact::load_from_db(context, contact_id).await?;
+    let mut contact = Contact::get_by_id(context, contact_id).await?;
     let changed = match profile_image {
         AvatarAction::Change(profile_image) => {
             if contact_id == ContactId::SELF {
@@ -1434,7 +1473,7 @@ pub(crate) async fn set_status(
                 .await?;
         }
     } else {
-        let mut contact = Contact::load_from_db(context, contact_id).await?;
+        let mut contact = Contact::get_by_id(context, contact_id).await?;
 
         if contact.status != status {
             contact.status = status;
@@ -1752,7 +1791,7 @@ mod tests {
         .await?;
         assert_ne!(id, ContactId::UNDEFINED);
 
-        let contact = Contact::load_from_db(&context.ctx, id).await.unwrap();
+        let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_authname(), "bob");
         assert_eq!(contact.get_display_name(), "bob");
@@ -1780,7 +1819,7 @@ mod tests {
         .await?;
         assert_eq!(contact_bob_id, id);
         assert_eq!(modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&context.ctx, id).await.unwrap();
+        let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
         assert_eq!(contact.get_name(), "someone");
         assert_eq!(contact.get_authname(), "bob");
         assert_eq!(contact.get_display_name(), "someone");
@@ -1846,7 +1885,7 @@ mod tests {
         .unwrap();
         assert!(!contact_id.is_special());
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&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");
@@ -1865,7 +1904,7 @@ mod tests {
         .unwrap();
         assert_eq!(contact_id, contact_id_test);
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_name(), "Real one");
         assert_eq!(contact.get_addr(), "one@eins.org");
         assert!(!contact.is_blocked());
@@ -1881,7 +1920,7 @@ mod tests {
         .unwrap();
         assert!(!contact_id.is_special());
         assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&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");
@@ -1898,7 +1937,7 @@ mod tests {
         .unwrap();
         assert_eq!(contact_id, contact_id_test);
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_name_n_addr(), "m. serious (three@drei.sam)");
         assert!(!contact.is_blocked());
 
@@ -1913,7 +1952,7 @@ mod tests {
         .unwrap();
         assert_eq!(contact_id, contact_id_test);
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&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());
@@ -1929,14 +1968,14 @@ mod tests {
         .unwrap();
         assert!(!contact_id.is_special());
         assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&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::load_from_db(&t, ContactId::SELF).await.unwrap();
+        let contact = Contact::get_by_id(&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());
@@ -1967,7 +2006,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::load_from_db(&t, *contact_id).await?;
+        let contact = Contact::get_by_id(&t, *contact_id).await?;
         assert_eq!(contact.get_authname(), "");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "f@example.org");
@@ -1993,7 +2032,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::load_from_db(&t, *contact_id).await?;
+        let contact = Contact::get_by_id(&t, *contact_id).await?;
         assert_eq!(contact.get_authname(), "Flobbyfoo");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "Flobbyfoo");
@@ -2023,7 +2062,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::load_from_db(&t, *contact_id).await?;
+        let contact = Contact::get_by_id(&t, *contact_id).await?;
         assert_eq!(contact.get_authname(), "Foo Flobby");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "Foo Flobby");
@@ -2041,7 +2080,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::load_from_db(&t, *contact_id).await?;
+        let contact = Contact::get_by_id(&t, *contact_id).await?;
         assert_eq!(contact.get_authname(), "Foo Flobby");
         assert_eq!(contact.get_name(), "Falk");
         assert_eq!(contact.get_display_name(), "Falk");
@@ -2080,7 +2119,7 @@ mod tests {
 
         // If a contact has ongoing chats, contact is only hidden on deletion
         Contact::delete(&alice, contact_id).await?;
-        let contact = Contact::load_from_db(&alice, contact_id).await?;
+        let contact = Contact::get_by_id(&alice, contact_id).await?;
         assert_eq!(contact.origin, Origin::Hidden);
         assert_eq!(
             Contact::get_all(&alice, 0, Some("bob@example.net"))
@@ -2094,7 +2133,7 @@ mod tests {
 
         // Can delete contact physically now
         Contact::delete(&alice, contact_id).await?;
-        assert!(Contact::load_from_db(&alice, contact_id).await.is_err());
+        assert!(Contact::get_by_id(&alice, contact_id).await.is_err());
         assert_eq!(
             Contact::get_all(&alice, 0, Some("bob@example.net"))
                 .await?
@@ -2113,7 +2152,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::load_from_db(&t, contact_id1).await.is_err());
+        assert!(Contact::get_by_id(&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);
@@ -2122,12 +2161,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::load_from_db(&t, contact_id2).await?;
+        let contact = Contact::get_by_id(&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::load_from_db(&t, contact_id3).await?;
+        let contact = Contact::get_by_id(&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);
@@ -2150,7 +2189,7 @@ mod tests {
         .unwrap();
         assert!(!contact_id.is_special());
         assert_eq!(sth_modified, Modifier::Created);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "bob1");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "bob1");
@@ -2166,7 +2205,7 @@ mod tests {
         .unwrap();
         assert!(!contact_id.is_special());
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "bob2");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "bob2");
@@ -2176,7 +2215,7 @@ mod tests {
             .await
             .unwrap();
         assert!(!contact_id.is_special());
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "bob2");
         assert_eq!(contact.get_name(), "bob3");
         assert_eq!(contact.get_display_name(), "bob3");
@@ -2192,7 +2231,7 @@ mod tests {
         .unwrap();
         assert!(!contact_id.is_special());
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "bob4");
         assert_eq!(contact.get_name(), "bob3");
         assert_eq!(contact.get_display_name(), "bob3");
@@ -2205,7 +2244,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::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "claire@example.org");
@@ -2221,7 +2260,7 @@ mod tests {
         .unwrap();
         assert_eq!(contact_id, contact_id_same);
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "claire1");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "claire1");
@@ -2237,7 +2276,7 @@ mod tests {
         .unwrap();
         assert_eq!(contact_id, contact_id_same);
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "claire2");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "claire2");
@@ -2260,7 +2299,7 @@ mod tests {
         )
         .await?;
         assert_eq!(sth_modified, Modifier::Created);
-        let contact = Contact::load_from_db(&t, contact_id).await?;
+        let contact = Contact::get_by_id(&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.
@@ -2273,7 +2312,7 @@ mod tests {
         .await?;
         assert_eq!(contact_id, contact_id_same);
         assert_eq!(sth_modified, Modifier::Modified);
-        let contact = Contact::load_from_db(&t, contact_id).await?;
+        let contact = Contact::get_by_id(&t, contact_id).await?;
         assert_eq!(contact.get_display_name(), "Not Bob");
 
         // Incoming message from Bob, changing the name back.
@@ -2286,7 +2325,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::load_from_db(&t, contact_id).await?;
+        let contact = Contact::get_by_id(&t, contact_id).await?;
         assert_eq!(contact.get_display_name(), "Bob");
 
         Ok(())
@@ -2300,7 +2339,7 @@ mod tests {
         let contact_id = Contact::create(&t, "dave1", "dave@example.org")
             .await
             .unwrap();
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "");
         assert_eq!(contact.get_name(), "dave1");
         assert_eq!(contact.get_display_name(), "dave1");
@@ -2314,14 +2353,14 @@ mod tests {
         )
         .await
         .unwrap();
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&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::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_authname(), "dave2");
         assert_eq!(contact.get_name(), "");
         assert_eq!(contact.get_display_name(), "dave2");
@@ -2339,21 +2378,21 @@ mod tests {
         let t = TestContext::new().await;
 
         let contact_id = Contact::create(&t, "", "<dave@example.org>").await.unwrap();
-        let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&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::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&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::load_from_db(&t, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
         assert_eq!(contact.get_name(), "name1");
         assert_eq!(contact.get_addr(), "dave@example.org");
 
@@ -2597,7 +2636,7 @@ CCCB 5AA9 F6E1 141C 9431
             Origin::ManuallyCreated,
         )
         .await?;
-        let contact = Contact::load_from_db(&alice, contact_id).await?;
+        let contact = Contact::get_by_id(&alice, contact_id).await?;
         assert_eq!(contact.last_seen(), 0);
 
         let mime = br#"Subject: Hello
@@ -2614,7 +2653,7 @@ Hi."#;
 
         let timestamp = msg.get_timestamp();
         assert!(timestamp > 0);
-        let contact = Contact::load_from_db(&alice, contact_id).await?;
+        let contact = Contact::get_by_id(&alice, contact_id).await?;
         assert_eq!(contact.last_seen(), timestamp);
 
         Ok(())

src/context.rs

@@ -755,6 +755,12 @@ impl Context {
             "last_msg_id",
             self.get_config_int(Config::LastMsgId).await?.to_string(),
         );
+        res.insert(
+            "verified_one_on_one_chats",
+            self.get_config_bool(Config::VerifiedOneOnOneChats)
+                .await?
+                .to_string(),
+        );
 
         let elapsed = self.creation_time.elapsed();
         res.insert("uptime", duration_to_str(elapsed.unwrap_or_default()));
@@ -1042,7 +1048,7 @@ mod tests {
 
     async fn receive_msg(t: &TestContext, chat: &Chat) {
         let members = get_chat_contacts(t, chat.id).await.unwrap();
-        let contact = Contact::load_from_db(t, *members.first().unwrap())
+        let contact = Contact::get_by_id(t, *members.first().unwrap())
             .await
             .unwrap();
         let msg = format!(
@@ -1304,11 +1310,11 @@ mod tests {
 
         // Add messages to chat with Bob.
         let mut msg1 = Message::new(Viewtype::Text);
-        msg1.set_text(Some("foobar".to_string()));
+        msg1.set_text("foobar".to_string());
         send_msg(&alice, chat.id, &mut msg1).await?;
 
         let mut msg2 = Message::new(Viewtype::Text);
-        msg2.set_text(Some("barbaz".to_string()));
+        msg2.set_text("barbaz".to_string());
         send_msg(&alice, chat.id, &mut msg2).await?;
 
         // Global search with a part of text finds the message.
@@ -1404,7 +1410,7 @@ mod tests {
 
         // Add 999 messages
         let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some("foobar".to_string()));
+        msg.set_text("foobar".to_string());
         for _ in 0..999 {
             send_msg(&alice, chat.id, &mut msg).await?;
         }

src/decrypt.rs

@@ -399,7 +399,7 @@ 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.as_deref(), Some("Hello from Thunderbird!"));
+        assert_eq!(msg.text, "Hello from Thunderbird!");
 
         Ok(())
     }

src/dehtml.rs

@@ -10,10 +10,11 @@ use quick_xml::{
     Reader,
 };
 
-static LINE_RE: Lazy<regex::Regex> = Lazy::new(|| regex::Regex::new(r"(\r?\n)+").unwrap());
+use crate::simplify::{simplify_quote, SimplifiedText};
 
 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
@@ -29,17 +30,22 @@ struct Dehtml {
 }
 
 impl Dehtml {
-    fn line_prefix(&self) -> &str {
-        if self.divs_since_quoted_content_div > 0 || self.blockquotes_since_blockquote > 0 {
-            "> "
+    /// 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
         } 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
@@ -51,30 +57,70 @@ 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,
 }
 
-// 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);
+pub(crate) fn dehtml(buf: &str) -> Option<SimplifiedText> {
+    let (s, quote) = dehtml_quick_xml(buf);
     if !s.trim().is_empty() {
-        return Some(s);
+        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()
+        });
     }
     let s = dehtml_manually(buf);
     if !s.trim().is_empty() {
-        return Some(s);
+        let text = dehtml_cleanup(s);
+        return Some(SimplifiedText {
+            text,
+            ..Default::default()
+        });
     }
     None
 }
 
-fn dehtml_quick_xml(buf: &str) -> String {
+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) {
     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,
@@ -126,22 +172,33 @@ fn dehtml_quick_xml(buf: &str) -> String {
         buf.clear();
     }
 
-    dehtml.strbuilder
+    (dehtml.strbuilder, dehtml.quote)
 }
 
 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 {
-            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();
+            // 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();
         } else {
-            dehtml.strbuilder += &last_added;
+            *dehtml.get_buf() += LINE_RE.replace_all(&last_added, "\n").as_ref();
         }
     }
 }
@@ -153,35 +210,36 @@ fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {
 
     match tag.as_str() {
         "style" | "script" | "title" | "pre" => {
-            dehtml.strbuilder += &dehtml.append_prefix("\n\n");
+            *dehtml.get_buf() += "\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.strbuilder += &dehtml.append_prefix("\n\n");
+            *dehtml.get_buf() += "\n\n";
             dehtml.add_text = AddText::YesRemoveLineEnds;
         }
         "a" => {
             if let Some(ref last_href) = dehtml.last_href.take() {
-                if dehtml.strbuilder.ends_with('[') {
-                    dehtml.strbuilder.truncate(dehtml.strbuilder.len() - 1);
+                let buf = dehtml.get_buf();
+                if buf.ends_with('[') {
+                    buf.truncate(buf.len() - 1);
                 } else {
-                    dehtml.strbuilder += "](";
-                    dehtml.strbuilder += last_href;
-                    dehtml.strbuilder += ")";
+                    *buf += "](";
+                    *buf += last_href;
+                    *buf += ")";
                 }
             }
         }
         "b" | "strong" => {
             if dehtml.get_add_text() != AddText::No {
-                dehtml.strbuilder += "*";
+                *dehtml.get_buf() += "*";
             }
         }
         "i" | "em" => {
             if dehtml.get_add_text() != AddText::No {
-                dehtml.strbuilder += "_";
+                *dehtml.get_buf() += "_";
             }
         }
         "blockquote" => pop_tag(&mut dehtml.blockquotes_since_blockquote),
@@ -201,7 +259,7 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
     match tag.as_str() {
         "p" | "table" | "td" => {
             if !dehtml.strbuilder.is_empty() {
-                dehtml.strbuilder += &dehtml.append_prefix("\n\n");
+                *dehtml.get_buf() += "\n\n";
             }
             dehtml.add_text = AddText::YesRemoveLineEnds;
         }
@@ -210,18 +268,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.strbuilder += &dehtml.append_prefix("\n\n");
+            *dehtml.get_buf() += "\n\n";
             dehtml.add_text = AddText::YesRemoveLineEnds;
         }
         "br" => {
-            dehtml.strbuilder += &dehtml.append_prefix("\n");
+            *dehtml.get_buf() += "\n";
             dehtml.add_text = AddText::YesRemoveLineEnds;
         }
         "style" | "script" | "title" => {
             dehtml.add_text = AddText::No;
         }
         "pre" => {
-            dehtml.strbuilder += &dehtml.append_prefix("\n\n");
+            *dehtml.get_buf() += "\n\n";
             dehtml.add_text = AddText::YesPreserveLineEnds;
         }
         "a" => {
@@ -242,18 +300,18 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
 
                 if !href.is_empty() {
                     dehtml.last_href = Some(href);
-                    dehtml.strbuilder += "[";
+                    *dehtml.get_buf() += "[";
                 }
             }
         }
         "b" | "strong" => {
             if dehtml.get_add_text() != AddText::No {
-                dehtml.strbuilder += "*";
+                *dehtml.get_buf() += "*";
             }
         }
         "i" | "em" => {
             if dehtml.get_add_text() != AddText::No {
-                dehtml.strbuilder += "_";
+                *dehtml.get_buf() += "_";
             }
         }
         "blockquote" => dehtml.blockquotes_since_blockquote += 1,
@@ -314,7 +372,6 @@ pub fn dehtml_manually(buf: &str) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::simplify::{simplify, SimplifiedText};
 
     #[test]
     fn test_dehtml() {
@@ -328,18 +385,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!(simplify(dehtml(input).unwrap(), true).text, output);
+            assert_eq!(dehtml(input).unwrap().text, output);
         }
         let none_cases = vec!["<html> </html>", ""];
         for input in none_cases {
@@ -349,31 +406,54 @@ mod tests {
 
     #[test]
     fn test_dehtml_parse_br() {
-        let html = "\r\r\nline1<br>\r\n\r\n\r\rline2<br/>line3\n\r";
-        let plain = dehtml(html).unwrap();
+        let html = "line1<br>line2";
+        let plain = dehtml(html).unwrap().text;
+        assert_eq!(plain, "line1\nline2");
 
-        assert_eq!(plain, "line1\n\r\r\rline2\nline3");
+        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");
+    }
+
+    #[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");
     }
 
     #[test]
     fn test_dehtml_parse_p() {
         let html = "<p>Foo</p><p>Bar</p>";
-        let plain = dehtml(html).unwrap();
+        let plain = dehtml(html).unwrap().text;
         assert_eq!(plain, "Foo\n\nBar");
 
         let html = "<p>Foo<p>Bar";
-        let plain = dehtml(html).unwrap();
+        let plain = dehtml(html).unwrap().text;
         assert_eq!(plain, "Foo\n\nBar");
 
         let html = "<p>Foo</p><p>Bar<p>Baz";
-        let plain = dehtml(html).unwrap();
+        let plain = dehtml(html).unwrap().text;
         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();
+        let plain = dehtml(html).unwrap().text;
 
         assert_eq!(plain, "[text](url)");
     }
@@ -381,7 +461,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();
+        let plain = dehtml(html).unwrap().text;
 
         assert_eq!(plain, "text *bold*<>");
     }
@@ -391,7 +471,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();
+        let plain = dehtml(html).unwrap().text;
 
         assert_eq!(
             plain,
@@ -415,32 +495,38 @@ mod tests {
         </html>
         "##;
         let txt = dehtml(input).unwrap();
-        assert_eq!(txt.trim(), "lots of text");
+        assert_eq!(txt.text.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.trim(), "two\nlines");
+        assert_eq!(txt.text.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,
-        } = simplify(dehtml, false);
+        } = dehtml;
         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)");
+    }
 }

src/download.rs

@@ -308,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(Some("Hi Bob".to_owned()));
+        msg.set_text("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);
@@ -355,7 +355,6 @@ 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(
@@ -370,7 +369,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(), Some("100k text...".to_string()));
+        assert_eq!(msg.get_text(), "100k text...");
 
         Ok(())
     }

src/ephemeral.rs

@@ -219,7 +219,7 @@ impl ChatId {
 
         if self.is_promoted(context).await? {
             let mut msg = Message::new(Viewtype::Text);
-            msg.text = Some(stock_ephemeral_timer_changed(context, timer, ContactId::SELF).await);
+            msg.text = 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!(
@@ -545,7 +545,7 @@ async fn next_expiration_timestamp(context: &Context) -> Option<i64> {
 
     ephemeral_timestamp
         .into_iter()
-        .chain(delete_device_after_timestamp.into_iter())
+        .chain(delete_device_after_timestamp)
         .min()
 }
 
@@ -1062,7 +1062,7 @@ mod tests {
         delete_expired_messages(t, not_deleted_at).await?;
 
         let loaded = Message::load_from_db(t, msg_id).await?;
-        assert_eq!(loaded.text.unwrap(), "Message text");
+        assert_eq!(loaded.text, "Message text");
         assert_eq!(loaded.chat_id, chat.id);
 
         assert!(next_expiration < deleted_at);
@@ -1082,7 +1082,7 @@ mod tests {
             .await;
 
         let loaded = Message::load_from_db(t, msg_id).await?;
-        assert_eq!(loaded.text.unwrap(), "");
+        assert_eq!(loaded.text, "");
         assert_eq!(loaded.chat_id, DC_CHAT_ID_TRASH);
 
         // Check that the msg was deleted locally.
@@ -1105,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!(msg.text.is_none_or_empty(), "{:?}", msg.text);
+            assert_eq!(msg.text, "");
             let rawtxt: Option<String> = t
                 .sql
                 .query_get_value("SELECT txt_raw FROM msgs WHERE id=?;", (msg_id,))

src/html.rs

@@ -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().unwrap().contains("this is plain"));
+        assert!(msg.get_text().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().unwrap().contains("this is plain"));
+        assert!(msg.get_text().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().unwrap().contains("this is plain"));
+        assert!(msg.get_text().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().unwrap().contains("this is plain"));
+        assert!(msg.get_text().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(Some("plain text".to_string()));
+        msg.set_text("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(), Some("plain text".to_string()));
+        assert_eq!(msg.get_text(), "plain text");
         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(), Some("plain text".to_string()));
+        assert_eq!(msg.get_text(), "plain text");
         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.as_ref().unwrap().contains("foo bar ä ö ü ß"));
+        assert!(msg.text.contains("foo bar ä ö ü ß"));
         assert!(msg.has_html());
         let html = msg.get_id().get_html(&t).await?.unwrap();
         println!("{html}");

src/imap.rs

@@ -412,7 +412,7 @@ impl Imap {
                     drop(lock);
 
                     let mut msg = Message::new(Viewtype::Text);
-                    msg.text = Some(message.clone());
+                    msg.text = message.clone();
                     if let Err(e) =
                         chat::add_device_msg_with_importance(context, None, Some(&mut msg), true)
                             .await
@@ -747,9 +747,51 @@ impl Imap {
                 }
             };
 
-            // Get the Message-ID or generate a fake one to identify the message in the database.
-            let message_id = prefetch_get_or_create_message_id(&headers);
-            let target = target_folder(context, folder, folder_meaning, &headers).await?;
+            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);
 
             context
                 .sql
@@ -2060,16 +2102,15 @@ fn get_fetch_headers(prefetch_msg: &Fetch) -> Result<Vec<mailparse::MailHeader>>
     }
 }
 
-fn prefetch_get_message_id(headers: &[mailparse::MailHeader]) -> Option<String> {
+pub(crate) 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 prefetch_get_or_create_message_id(headers: &[mailparse::MailHeader]) -> String {
-    prefetch_get_message_id(headers)
-        .unwrap_or_else(|| format!("{}{}", GENERATED_PREFIX, create_id()))
+pub(crate) fn create_message_id() -> String {
+    format!("{}{}", GENERATED_PREFIX, create_id())
 }
 
 /// Returns chat by prefetched headers.

src/imex.rs

@@ -253,12 +253,10 @@ 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 = Some(
-            "It seems you are using multiple devices with Delta Chat. Great!\n\n\
+        msg.text = "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(())
@@ -1030,10 +1028,7 @@ 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(),
-            Some("Test".to_string())
-        );
+        assert_ne!(alice.get_last_msg().await.get_text(), "Test");
 
         // Transfer the key.
         continue_key_transfer(&alice2, msg.id, &setup_code).await?;
@@ -1041,10 +1036,7 @@ 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(),
-            Some("Test".to_string())
-        );
+        assert_eq!(alice.get_last_msg().await.get_text(), "Test");
 
         Ok(())
     }

src/imex/transfer.rs

@@ -275,7 +275,7 @@ impl BackupProvider {
             Ok(_) => {
                 context.emit_event(SendProgress::Completed.into());
                 let mut msg = Message::new(Viewtype::Text);
-                msg.text = Some(backup_transfer_msg_body(context).await);
+                msg.text = 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(Some("hi there".to_string()));
+        msg.set_text("hi there".to_string());
         send_msg(&ctx0, self_chat.id, &mut msg).await.unwrap();
 
         // Send an attachment in the self chat
@@ -643,7 +643,7 @@ mod tests {
             _ => panic!("wrong chat item"),
         };
         let msg = Message::load_from_db(&ctx1, *msgid).await.unwrap();
-        let text = msg.get_text().unwrap();
+        let text = msg.get_text();
         assert_eq!(text, "hi there");
         let msgid = match msgs.get(1).unwrap() {
             ChatItem::Message { msg_id } => msg_id,

src/lib.rs

@@ -8,7 +8,6 @@
     missing_debug_implementations,
     missing_docs,
     clippy::all,
-    clippy::indexing_slicing,
     clippy::wildcard_imports,
     clippy::needless_borrow,
     clippy::cast_lossless,
@@ -17,6 +16,7 @@
     clippy::explicit_into_iter_loop,
     clippy::cloned_instead_of_copied
 )]
+#![cfg_attr(not(test), warn(clippy::indexing_slicing))]
 #![allow(
     clippy::match_bool,
     clippy::mixed_read_write_in_expression,

src/location.rs

@@ -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 = Some(stock_str::msg_location_enabled(context).await);
+        msg.text = stock_str::msg_location_enabled(context).await;
         msg.param.set_cmd(SystemMessage::LocationStreamingEnabled);
         chat::send_msg(context, chat_id, &mut msg)
             .await
@@ -735,7 +735,7 @@ async fn maybe_send_locations(context: &Context) -> Result<Option<u64>> {
 
             next_event = next_event
                 .into_iter()
-                .chain(u64::try_from(locations_send_until - now).into_iter())
+                .chain(u64::try_from(locations_send_until - now))
                 .min();
 
             if has_locations {
@@ -759,7 +759,7 @@ async fn maybe_send_locations(context: &Context) -> Result<Option<u64>> {
                     );
                     next_event = next_event
                         .into_iter()
-                        .chain(u64::try_from(locations_last_sent + 61 - now).into_iter())
+                        .chain(u64::try_from(locations_last_sent + 61 - now))
                         .min();
                 }
             } else {
@@ -885,7 +885,7 @@ Text message."#,
         )
         .await?;
         let received_msg = alice.get_last_msg().await;
-        assert_eq!(received_msg.text.unwrap(), "Text message.");
+        assert_eq!(received_msg.text, "Text message.");
 
         receive_imf(
             &alice,

src/message.rs

@@ -7,29 +7,28 @@ use anyhow::{ensure, format_err, Context as _, Result};
 use deltachat_derive::{FromSql, ToSql};
 use serde::{Deserialize, Serialize};
 
-use crate::chat::{self, Chat, ChatId};
+use crate::chat::{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, Origin};
+use crate::contact::{Contact, ContactId};
 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, DeliveryReport, SystemMessage};
+use crate::mimeparser::{parse_message_id, 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, create_smeared_timestamp, get_filebytes, get_filemeta,
-    gm2local_offset, read_file, time, timestamp_to_str, truncate,
+    buf_compress, buf_decompress, get_filebytes, get_filemeta, gm2local_offset, read_file, time,
+    timestamp_to_str, truncate,
 };
 
 /// Message ID, including reserved IDs.
@@ -157,6 +156,171 @@ 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 {
@@ -258,7 +422,7 @@ pub struct Message {
     pub(crate) timestamp_rcvd: i64,
     pub(crate) ephemeral_timer: EphemeralTimer,
     pub(crate) ephemeral_timestamp: i64,
-    pub(crate) text: Option<String>,
+    pub(crate) text: String,
 
     /// Message subject.
     ///
@@ -367,7 +531,7 @@ impl Message {
                             .filter(|error| !error.is_empty()),
                         is_dc_message: row.get("msgrmsg")?,
                         mime_modified: row.get("mime_modified")?,
-                        text: Some(text),
+                        text,
                         subject: row.get("subject")?,
                         param: row.get::<_, String>("param")?.parse().unwrap_or_default(),
                         hidden: row.get("hidden")?,
@@ -379,7 +543,8 @@ impl Message {
                     Ok(msg)
                 },
             )
-            .await?;
+            .await
+            .with_context(|| format!("failed to load message {id} from the database"))?;
 
         Ok(msg)
     }
@@ -514,8 +679,8 @@ impl Message {
     }
 
     /// Returns the text of the message.
-    pub fn get_text(&self) -> Option<String> {
-        self.text.as_ref().map(|s| s.to_string())
+    pub fn get_text(&self) -> String {
+        self.text.clone()
     }
 
     /// Returns message subject.
@@ -791,7 +956,7 @@ impl Message {
     }
 
     /// Sets or unsets message text.
-    pub fn set_text(&mut self, text: Option<String>) {
+    pub fn set_text(&mut self, text: String) {
         self.text = text;
     }
 
@@ -883,7 +1048,7 @@ impl Message {
                 self.param.set(Param::GuaranteeE2ee, "1");
             }
 
-            let text = quote.get_text().unwrap_or_default();
+            let text = quote.get_text();
             self.param.set(
                 Param::Quote,
                 if text.is_empty() {
@@ -1108,171 +1273,6 @@ 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 {
@@ -1683,176 +1683,6 @@ pub(crate) async fn set_msg_failed(context: &Context, msg_id: MsgId, error: &str
     }
 }
 
-/// 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,
-            "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(None);
-    }
-
-    let res = 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| {
-                Ok((
-                    row.get::<_, MsgId>("msg_id")?,
-                    row.get::<_, ChatId>("chat_id")?,
-                    row.get::<_, MessageState>("state")?,
-                ))
-            },
-        )
-        .await?;
-
-    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(())
-}
-
 /// The number of messages assigned to unblocked chats
 pub async fn get_unblocked_msg_cnt(context: &Context) -> usize {
     match context
@@ -2075,7 +1905,7 @@ mod tests {
     use num_traits::FromPrimitive;
 
     use super::*;
-    use crate::chat::{marknoticed_chat, ChatItem};
+    use crate::chat::{self, marknoticed_chat, ChatItem};
     use crate::chatlist::Chatlist;
     use crate::receive_imf::receive_imf;
     use crate::test_utils as test;
@@ -2251,7 +2081,7 @@ mod tests {
         let chat = d.create_chat_with_contact("", "dest@example.com").await;
 
         let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some("Quoted message".to_string()));
+        msg.set_text("Quoted message".to_string());
 
         // Prepare message for sending, so it gets a Message-Id.
         assert!(msg.rfc724_mid.is_empty());
@@ -2263,14 +2093,14 @@ mod tests {
         msg2.set_quote(ctx, Some(&msg))
             .await
             .expect("can't set quote");
-        assert!(msg2.quoted_text() == msg.get_text());
+        assert_eq!(msg2.quoted_text().unwrap(), msg.get_text());
 
         let quoted_msg = msg2
             .quoted_message(ctx)
             .await
             .expect("error while retrieving quoted message")
             .expect("quoted message not found");
-        assert!(quoted_msg.get_text() == msg2.quoted_text());
+        assert_eq!(quoted_msg.get_text(), msg2.quoted_text().unwrap());
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -2294,7 +2124,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().unwrap(), "hello".to_string());
+        assert_eq!(msg.get_text(), "hello".to_string());
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -2308,10 +2138,10 @@ mod tests {
             .unwrap()
             .first()
             .unwrap();
-        let contact = Contact::load_from_db(&alice, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&alice, contact_id).await.unwrap();
 
         let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some("bla blubb".to_string()));
+        msg.set_text("bla blubb".to_string());
         msg.set_override_sender_name(Some("over ride".to_string()));
         assert_eq!(
             msg.get_override_sender_name(),
@@ -2328,10 +2158,10 @@ mod tests {
             .unwrap()
             .first()
             .unwrap();
-        let contact = Contact::load_from_db(&bob, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&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, Some("bla blubb".to_string()));
+        assert_eq!(msg.text, "bla blubb");
         assert_eq!(
             msg.get_override_sender_name(),
             Some("over ride".to_string())
@@ -2351,7 +2181,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(Some("this is the text!".to_string()));
+        msg.set_text("this is the text!".to_string());
 
         // alice sends to bob,
         assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);
@@ -2437,7 +2267,7 @@ mod tests {
 
         // check outgoing messages states on sender side
         let mut alice_msg = Message::new(Viewtype::Text);
-        alice_msg.set_text(Some("hi!".to_string()));
+        alice_msg.set_text("hi!".to_string());
         assert_eq!(alice_msg.get_state(), MessageState::Undefined); // message not yet in db, assert_state() won't work
 
         alice_chat
@@ -2493,7 +2323,7 @@ mod tests {
         )
         .await?;
         let msg = alice.get_last_msg().await;
-        assert_eq!(msg.get_text().unwrap(), "hello".to_string());
+        assert_eq!(msg.get_text(), "hello".to_string());
         assert!(msg.is_bot());
 
         // Alice receives a message from Bob who is not the bot anymore.
@@ -2510,7 +2340,7 @@ mod tests {
         )
         .await?;
         let msg = alice.get_last_msg().await;
-        assert_eq!(msg.get_text().unwrap(), "hello again".to_string());
+        assert_eq!(msg.get_text(), "hello again".to_string());
         assert!(!msg.is_bot());
 
         Ok(())
@@ -2549,13 +2379,13 @@ mod tests {
 
         let sent = alice.send_text(chat.id, "> First quote").await;
         let received = bob.recv_msg(&sent).await;
-        assert_eq!(received.text.as_deref(), Some("> First quote"));
+        assert_eq!(received.text, "> 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.as_deref(), Some("> Second quote"));
+        assert_eq!(received.text, "> Second quote");
         assert!(received.quoted_text().is_none());
         assert!(received.quoted_message(&bob).await?.is_none());
 
@@ -2572,24 +2402,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.as_deref(), Some(text));
+        assert_eq!(received.text, 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.as_deref(), Some(text));
+        assert_eq!(received.text, 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.as_deref(), Some(text));
+        assert_eq!(received.text, 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.as_deref(), Some(python_program));
+        assert_eq!(received.text, python_program);
 
         Ok(())
     }

src/mimefactory.rs

@@ -237,7 +237,7 @@ impl<'a> MimeFactory<'a> {
     ) -> Result<MimeFactory<'a>> {
         ensure!(!msg.chat_id.is_special(), "Invalid chat id");
 
-        let contact = Contact::load_from_db(context, msg.from_id).await?;
+        let contact = Contact::get_by_id(context, msg.from_id).await?;
         let from_addr = context.get_primary_self_addr().await?;
         let from_displayname = context
             .get_config(Config::Displayname)
@@ -896,7 +896,17 @@ impl<'a> MimeFactory<'a> {
         let mut placeholdertext = None;
         let mut meta_part = None;
 
-        if chat.is_protected() {
+        let send_verified_headers = match chat.typ {
+            Chattype::Undefined => bail!("Undefined chat type"),
+            // In single chats, the protection status isn't necessarily the same for both sides,
+            // so we don't send the Chat-Verified header:
+            Chattype::Single => false,
+            Chattype::Group => true,
+            // Mailinglists and broadcast lists can actually never be verified:
+            Chattype::Mailinglist => false,
+            Chattype::Broadcast => false,
+        };
+        if chat.is_protected() && send_verified_headers {
             headers
                 .protected
                 .push(Header::new("Chat-Verified".to_string(), "1".to_string()));
@@ -918,6 +928,19 @@ 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(),
@@ -927,6 +950,9 @@ 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(),
@@ -1138,15 +1164,8 @@ impl<'a> MimeFactory<'a> {
         } else {
             None
         };
-        let final_text = {
-            if let Some(ref text) = placeholdertext {
-                text
-            } else if let Some(ref text) = self.msg.text {
-                text
-            } else {
-                ""
-            }
-        };
+
+        let final_text = placeholdertext.as_deref().unwrap_or(&self.msg.text);
 
         let mut quoted_text = self
             .msg
@@ -1792,7 +1811,7 @@ mod tests {
             quote: Option<&Message>,
         ) -> Result<String> {
             let mut new_msg = Message::new(Viewtype::Text);
-            new_msg.set_text(Some("Hi".to_string()));
+            new_msg.set_text("Hi".to_string());
             if let Some(q) = quote {
                 new_msg.set_quote(t, Some(q)).await?;
             }
@@ -1879,7 +1898,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(Some("Hi".to_string()));
+        new_msg.set_text("Hi".to_string());
         new_msg.chat_id = chat_id;
         chat::prepare_msg(&t, chat_id, &mut new_msg).await.unwrap();
 
@@ -1987,7 +2006,7 @@ mod tests {
         chat_id.accept(context).await.unwrap();
 
         let mut new_msg = Message::new(Viewtype::Text);
-        new_msg.set_text(Some("Hi".to_string()));
+        new_msg.set_text("Hi".to_string());
         new_msg.chat_id = chat_id;
         chat::prepare_msg(context, chat_id, &mut new_msg)
             .await
@@ -2105,7 +2124,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(Some("this is the text!".to_string()));
+        msg.set_text("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");
@@ -2165,7 +2184,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(Some("this is the text!".to_string()));
+        msg.set_text("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");
@@ -2196,7 +2215,7 @@ mod tests {
             .await
             .unwrap()
             .unwrap();
-        let alice_contact = Contact::load_from_db(&bob.ctx, alice_id).await.unwrap();
+        let alice_contact = Contact::get_by_id(&bob.ctx, alice_id).await.unwrap();
         assert!(alice_contact
             .get_profile_image(&bob.ctx)
             .await
@@ -2228,7 +2247,7 @@ mod tests {
         assert_eq!(body.match_indices("Subject:").count(), 0);
 
         bob.recv_msg(&sent_msg).await;
-        let alice_contact = Contact::load_from_db(&bob.ctx, alice_id).await.unwrap();
+        let alice_contact = Contact::get_by_id(&bob.ctx, alice_id).await.unwrap();
         assert!(alice_contact
             .get_profile_image(&bob.ctx)
             .await
@@ -2277,7 +2296,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(Some("this is the text!".to_string()));
+        msg.set_text("this is the text!".to_string());
 
         let sent_msg = t.send_msg(chat.id, &mut msg).await;
         let payload = sent_msg.payload();

src/mimeparser.rs

@@ -15,9 +15,10 @@ 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::{DC_DESIRED_TEXT_LINES, DC_DESIRED_TEXT_LINE_LEN};
-use crate::contact::{addr_cmp, addr_normalize, ContactId};
+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::context::Context;
 use crate::decrypt::{
     keyring_from_peerstate, prepare_decryption, try_decrypt, validate_detached_signature,
@@ -28,13 +29,16 @@ use crate::events::EventType;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
 use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
 use crate::keyring::Keyring;
-use crate::message::{self, Viewtype};
+use crate::message::{self, set_msg_failed, update_msg_state, MessageState, MsgId, 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::{get_filemeta, parse_receive_headers, strip_rtlo_characters, truncate_by_lines};
+use crate::tools::{
+    create_smeared_timestamp, get_filemeta, parse_receive_headers, strip_rtlo_characters,
+    truncate_by_lines,
+};
 use crate::{location, tools};
 
 /// A parsed MIME message.
@@ -639,7 +643,7 @@ impl MimeMessage {
                     .parts
                     .iter_mut()
                     .find(|part| !part.msg.is_empty() && !part.is_reaction);
-                if let Some(mut part) = part_with_text {
+                if let Some(part) = part_with_text {
                     part.msg = format!("{} – {}", subject, part.msg);
                 }
             }
@@ -776,10 +780,6 @@ impl MimeMessage {
         self.headers.contains_key("chat-version")
     }
 
-    pub(crate) fn has_headers(&self) -> bool {
-        !self.headers.is_empty()
-    }
-
     pub(crate) fn get_subject(&self) -> Option<String> {
         self.get_header(HeaderDef::Subject)
             .filter(|s| !s.is_empty())
@@ -1080,16 +1080,20 @@ impl MimeMessage {
                             Default::default()
                         } else {
                             let is_html = mime_type == mime::TEXT_HTML;
-                            let out = if is_html {
+                            if is_html {
                                 self.is_mime_modified = true;
-                                dehtml(&decoded_data).unwrap_or_else(|| {
+                                if let Some(text) = dehtml(&decoded_data) {
+                                    text
+                                } else {
                                     dehtml_failed = true;
-                                    decoded_data.clone()
-                                })
+                                    SimplifiedText {
+                                        text: decoded_data.clone(),
+                                        ..Default::default()
+                                    }
+                                }
                             } else {
-                                decoded_data.clone()
-                            };
-                            simplify(out, self.has_chat_version())
+                                simplify(decoded_data.clone(), self.has_chat_version())
+                            }
                         };
 
                         self.is_mime_modified = self.is_mime_modified
@@ -1648,16 +1652,10 @@ impl MimeMessage {
                 .iter()
                 .chain(&report.additional_message_ids)
             {
-                match message::handle_mdn(context, from_id, original_message_id, sent_timestamp)
-                    .await
+                if let Err(err) =
+                    handle_mdn(context, from_id, original_message_id, sent_timestamp).await
                 {
-                    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);
-                    }
+                    warn!(context, "Could not handle MDN: {err:#}.");
                 }
             }
         }
@@ -1668,8 +1666,8 @@ impl MimeMessage {
                     .iter()
                     .find(|p| p.typ == Viewtype::Text)
                     .map(|p| p.msg.clone());
-                if let Err(e) = message::handle_ndn(context, delivery_report, error).await {
-                    warn!(context, "Could not handle ndn: {}", e);
+                if let Err(err) = handle_ndn(context, delivery_report, error).await {
+                    warn!(context, "Could not handle NDN: {err:#}.");
                 }
             }
         }
@@ -1894,7 +1892,7 @@ fn get_mime_type(mail: &mailparse::ParsedMail<'_>) -> Result<(Mime, Viewtype)> {
             } else {
                 // Enacapsulated messages, see <https://www.w3.org/Protocols/rfc1341/7_3_Message.html>
                 // Also used as part "message/disposition-notification" of "multipart/report", which, however, will
-                // be handled separatedly.
+                // be handled separately.
                 // I've not seen any messages using this, so we do not attach these parts (maybe they're used to attach replies,
                 // which are unwanted at all).
                 // For now, we skip these parts at all; if desired, we could return DcMimeType::File/DC_MSG_File
@@ -2027,6 +2025,167 @@ 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?;
+        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::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)]
@@ -2931,7 +3090,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
@@ -2986,7 +3145,7 @@ K+TuvC7qOah0WLFhcsXWn2+dDV1bXuAeC769TkqkpHhdXfUHnVgK3Pv7u3rVPT5AMeFUGxRB2dP4
 CWt6wx7fiLp0qS9RrX75g6Gqw7nfCs6EcBERcIPt7DTe8VStJwf3LWqVwxl4gQl46yhfoqwEO+I=
 
 ------=_NextPart_000_0003_01D622B3.CA753E60--
-"##;
+"#;
 
         let message = MimeMessage::from_bytes(&context.ctx, &raw[..], None)
             .await
@@ -3221,10 +3380,7 @@ 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.as_ref().unwrap(),
-            "subj with important info – body text"
-        );
+        assert_eq!(msg.text, "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);
@@ -3364,7 +3520,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>
@@ -3372,11 +3528,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\
@@ -3388,14 +3544,14 @@ Subject: ...
 > Some quote.
 
 Some reply
-"###;
+";
 
         receive_imf(&t, raw, false).await?;
 
         let msg = t.get_last_msg().await;
-        assert_eq!(msg.get_text().unwrap(), "Some reply");
+        assert_eq!(msg.get_text(), "Some reply");
         let quoted_message = msg.quoted_message(&t).await?.unwrap();
-        assert_eq!(quoted_message.get_text().unwrap(), "Some quote.");
+        assert_eq!(quoted_message.get_text(), "Some quote.");
 
         Ok(())
     }
@@ -3406,7 +3562,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>
@@ -3415,7 +3571,7 @@ Subject: subject
 Chat-Disposition-Notification-To: alice@example.org
 
 Message.
-"###;
+";
 
         // Bob receives message.
         receive_imf(&bob, raw, false).await?;

src/peerstate.rs

@@ -392,6 +392,31 @@ impl Peerstate {
         }
     }
 
+    /// Returns a reference to the contact's public key fingerprint.
+    ///
+    /// Similar to [`Self::peek_key`], but returns the fingerprint instead of the key.
+    fn peek_key_fingerprint(&self, min_verified: PeerstateVerifiedStatus) -> Option<&Fingerprint> {
+        match min_verified {
+            PeerstateVerifiedStatus::BidirectVerified => self.verified_key_fingerprint.as_ref(),
+            PeerstateVerifiedStatus::Unverified => self
+                .public_key_fingerprint
+                .as_ref()
+                .or(self.gossip_key_fingerprint.as_ref()),
+        }
+    }
+
+    /// Returns true if the key used for opportunistic encryption in the 1:1 chat
+    /// is the same as the verified key.
+    ///
+    /// Note that verified groups always use the verified key no matter if the
+    /// opportunistic key matches or not.
+    pub(crate) fn is_using_verified_key(&self) -> bool {
+        let verified = self.peek_key_fingerprint(PeerstateVerifiedStatus::BidirectVerified);
+
+        verified.is_some()
+            && verified == self.peek_key_fingerprint(PeerstateVerifiedStatus::Unverified)
+    }
+
     /// Set this peerstate to verified
     /// Make sure to call `self.save_to_db` to save these changes
     /// Params:
@@ -535,7 +560,7 @@ impl Peerstate {
                 stock_str::contact_setup_changed(context, &self.addr).await
             }
             PeerstateChange::Aeap(new_addr) => {
-                let old_contact = Contact::load_from_db(context, contact_id).await?;
+                let old_contact = Contact::get_by_id(context, contact_id).await?;
                 stock_str::aeap_addr_changed(
                     context,
                     old_contact.get_display_name(),

src/plaintext.rs

@@ -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);
@@ -96,7 +96,12 @@ impl PlainText {
                 line += "<br/>\n";
             }
 
-            ret += &*line;
+            let len_with_indentation = line.len();
+            let line = line.trim_start_matches(' ');
+            for _ in line.len()..len_with_indentation {
+                ret += "&nbsp;";
+            }
+            ret += line;
         }
         ret += "</body></html>\n";
         ret
@@ -107,8 +112,8 @@ impl PlainText {
 mod tests {
     use super::*;
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_plain_to_html() {
+    #[test]
+    fn test_plain_to_html() {
         let html = PlainText {
             text: r##"line 1
 line 2
@@ -122,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" />
@@ -133,12 +138,12 @@ 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>
-"##
+"#
         );
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_plain_to_html_encapsulated() {
+    #[test]
+    fn test_plain_to_html_encapsulated() {
         let html = PlainText {
             text: r#"line with <http://encapsulated.link/?foo=_bar> here!"#.to_string(),
             flowed: false,
@@ -158,8 +163,8 @@ line with &lt;<a href="http://encapsulated.link/?foo=_bar">http://encapsulated.l
         );
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_plain_to_html_nolink() {
+    #[test]
+    fn test_plain_to_html_nolink() {
         let html = PlainText {
             text: r#"line with nohttp://no.link here"#.to_string(),
             flowed: false,
@@ -179,8 +184,8 @@ line with nohttp://no.link here<br/>
         );
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_plain_to_html_mailto() {
+    #[test]
+    fn test_plain_to_html_mailto() {
         let html = PlainText {
             text: r#"just an address: foo@bar.org another@one.de"#.to_string(),
             flowed: false,
@@ -200,8 +205,8 @@ just an address: <a href="mailto:foo@bar.org">foo@bar.org</a> <a href="mailto:an
         );
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_plain_to_html_flowed() {
+    #[test]
+    fn test_plain_to_html_flowed() {
         let html = PlainText {
             text: "line \nstill line\n>quote \n>still quote\n >no quote".to_string(),
             flowed: true,
@@ -224,8 +229,8 @@ line still line<br/>
         );
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_plain_to_html_flowed_delsp() {
+    #[test]
+    fn test_plain_to_html_flowed_delsp() {
         let html = PlainText {
             text: "line \nstill line\n>quote \n>still quote\n >no quote".to_string(),
             flowed: true,
@@ -248,8 +253,8 @@ linestill line<br/>
         );
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_plain_to_html_fixed() {
+    #[test]
+    fn test_plain_to_html_fixed() {
         let html = PlainText {
             text: "line \nstill line\n>quote \n>still quote\n >no quote".to_string(),
             flowed: false,
@@ -267,7 +272,32 @@ line <br/>
 still line<br/>
 <em>&gt;quote </em><br/>
 <em>&gt;still quote</em><br/>
- &gt;no quote<br/>
+&nbsp;&gt;no quote<br/>
+</body></html>
+"#
+        );
+    }
+
+    #[test]
+    fn test_plain_to_html_indentation() {
+        let html = PlainText {
+            text: "def foo():\n    pass\n\ndef bar(x):\n    return x + 5".to_string(),
+            flowed: false,
+            delsp: false,
+        }
+        .to_html();
+        assert_eq!(
+            html,
+            r#"<!DOCTYPE html>
+<html><head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="color-scheme" content="light dark" />
+</head><body>
+def foo():<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;pass<br/>
+<br/>
+def bar(x):<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;return x + 5<br/>
 </body></html>
 "#
         );

src/provider.rs

@@ -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.iter() {
+            for (provider_domain, provider) in &*PROVIDER_DATA {
                 if provider.id != "gmail" {
                     // MX lookup is limited to Gmail for security reasons
                     continue;

src/qr_code_generator.rs

@@ -121,6 +121,7 @@ fn inner_generate_secure_join_qr_code(
     w.elem("svg", |d| {
         d.attr("xmlns", "http://www.w3.org/2000/svg")?;
         d.attr("viewBox", format_args!("0 0 {width} {height}"))?;
+        d.attr("xmlns:xlink", "http://www.w3.org/1999/xlink")?; // required for enabling xlink:href on browsers
         Ok(())
     })?
     .build(|w| {
@@ -240,7 +241,7 @@ fn inner_generate_secure_join_qr_code(
                 d.attr("preserveAspectRatio", "none")?;
                 d.attr("clip-path", "url(#avatar-cut)")?;
                 d.attr(
-                    "href", /*might need xlink:href instead if it doesn't work on older devices?*/
+                    "xlink:href", /* xlink:href is needed otherwise it won't even display in inkscape not to mention qt's QSvgHandler */
                     format!(
                         "data:image/jpeg;base64,{}",
                         base64::engine::general_purpose::STANDARD.encode(img)

src/quota.rs

@@ -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 = Some(stock_str::quota_exceeding(self, highest).await);
+                        msg.text = 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?;

src/reaction.rs

@@ -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 = Some(reaction.as_str().to_string());
+    reaction_msg.text = reaction.as_str().to_string();
     reaction_msg.set_reaction();
     reaction_msg.in_reply_to = Some(msg.rfc724_mid);
     reaction_msg.hidden = true;

src/receive_imf.rs

@@ -4,7 +4,7 @@ use std::cmp::min;
 use std::collections::HashSet;
 use std::convert::TryFrom;
 
-use anyhow::{bail, ensure, Context as _, Result};
+use anyhow::{Context as _, Result};
 use mailparse::{parse_mail, SingleInfo};
 use num_traits::FromPrimitive;
 use once_cell::sync::Lazy;
@@ -14,7 +14,7 @@ use crate::chat::{self, Chat, ChatId, ChatIdBlocked, ProtectionStatus};
 use crate::config::Config;
 use crate::constants::{Blocked, Chattype, ShowEmails, DC_CHAT_ID_TRASH};
 use crate::contact::{
-    may_be_valid_addr, normalize_name, Contact, ContactAddress, ContactId, Origin, VerifiedStatus,
+    may_be_valid_addr, normalize_name, Contact, ContactAddress, ContactId, Origin,
 };
 use crate::context::Context;
 use crate::debug_logging::maybe_set_logging_xdc_inner;
@@ -74,7 +74,8 @@ 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_or_create_message_id(&mail.headers);
+    let rfc724_mid =
+        imap::prefetch_get_message_id(&mail.headers).unwrap_or_else(imap::create_message_id);
     receive_imf_inner(context, &rfc724_mid, imf_raw, seen, None, false).await
 }
 
@@ -138,12 +139,6 @@ pub(crate) async fn receive_imf_inner(
         Ok(mime_parser) => mime_parser,
     };
 
-    // we can not add even an empty record if we have no info whatsoever
-    if !mime_parser.has_headers() {
-        warn!(context, "receive_imf: no headers found.");
-        return Ok(None);
-    }
-
     info!(context, "Received message has Message-Id: {rfc724_mid}");
 
     // check, if the mail is already in our database.
@@ -410,7 +405,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::load_from_db(context, from_id).await {
+        if let Ok(contact) = Contact::get_by_id(context, from_id).await {
             from_id_blocked = contact.blocked;
             incoming_origin = contact.origin;
         }
@@ -599,12 +594,17 @@ async fn add_parts(
 
         // In lookup_chat_by_reply() and create_or_lookup_group(), it can happen that the message is put into a chat
         // but the From-address is not a member of this chat.
-        if let Some(chat_id) = chat_id {
-            if !chat::is_contact_in_chat(context, chat_id, from_id).await? {
-                let chat = Chat::load_from_db(context, chat_id).await?;
+        if let Some(group_chat_id) = chat_id {
+            if !chat::is_contact_in_chat(context, group_chat_id, from_id).await? {
+                let chat = Chat::load_from_db(context, group_chat_id).await?;
                 if chat.is_protected() {
-                    let s = stock_str::unknown_sender_for_chat(context).await;
-                    mime_parser.repl_msg_by_error(&s);
+                    if chat.typ == Chattype::Single {
+                        // Just assign the message to the 1:1 chat with the actual sender instead.
+                        chat_id = None;
+                    } else {
+                        let s = stock_str::unknown_sender_for_chat(context).await;
+                        mime_parser.repl_msg_by_error(&s);
+                    }
                 } else {
                     // In non-protected chats, just mark the sender as overridden. Therefore, the UI will prepend `~`
                     // to the sender's name, indicating to the user that he/she is not part of the group.
@@ -620,7 +620,7 @@ async fn add_parts(
                 context,
                 mime_parser,
                 sent_timestamp,
-                chat_id,
+                group_chat_id,
                 from_id,
                 to_ids,
             )
@@ -685,7 +685,7 @@ async fn add_parts(
             let create_blocked = if from_id == ContactId::SELF {
                 Blocked::Not
             } else {
-                let contact = Contact::load_from_db(context, from_id).await?;
+                let contact = Contact::get_by_id(context, from_id).await?;
                 match contact.is_blocked() {
                     true => Blocked::Yes,
                     false if is_bot => Blocked::Not,
@@ -723,6 +723,44 @@ async fn add_parts(
                         );
                     }
                 }
+
+                // The next block checks if the message was sent with verified encryption
+                // and sets the protection of the 1:1 chat accordingly.
+                if is_partial_download.is_none()
+                    && mime_parser.get_header(HeaderDef::SecureJoin).is_none()
+                    && !is_mdn
+                {
+                    let mut new_protection = match has_verified_encryption(
+                        context,
+                        mime_parser,
+                        from_id,
+                        to_ids,
+                        Chattype::Single,
+                    )
+                    .await?
+                    {
+                        VerifiedEncryption::Verified => ProtectionStatus::Protected,
+                        VerifiedEncryption::NotVerified(_) => ProtectionStatus::Unprotected,
+                    };
+
+                    let chat = Chat::load_from_db(context, chat_id).await?;
+
+                    if chat.protected != new_protection {
+                        if new_protection == ProtectionStatus::Unprotected
+                            && context
+                                .get_config_bool(Config::VerifiedOneOnOneChats)
+                                .await?
+                        {
+                            new_protection = ProtectionStatus::ProtectionBroken;
+                        }
+
+                        let sort_timestamp =
+                            calc_sort_timestamp(context, sent_timestamp, chat_id, true).await?;
+                        chat_id
+                            .set_protection(context, new_protection, sort_timestamp, Some(from_id))
+                            .await?;
+                    }
+                }
             }
         }
 
@@ -810,7 +848,7 @@ async fn add_parts(
                 }
             }
             if chat_id.is_none() && allow_creation {
-                let to_contact = Contact::load_from_db(context, to_id).await?;
+                let to_contact = Contact::get_by_id(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?
@@ -989,42 +1027,14 @@ async fn add_parts(
     // if a chat is protected and the message is fully downloaded, check additional properties
     if !chat_id.is_special() && is_partial_download.is_none() {
         let chat = Chat::load_from_db(context, chat_id).await?;
-        let new_status = match mime_parser.is_system_message {
-            SystemMessage::ChatProtectionEnabled => Some(ProtectionStatus::Protected),
-            SystemMessage::ChatProtectionDisabled => Some(ProtectionStatus::Unprotected),
-            _ => None,
-        };
 
-        if chat.is_protected() || new_status.is_some() {
-            if let Err(err) = check_verified_properties(context, mime_parser, from_id, to_ids).await
+        if chat.is_protected() {
+            if let VerifiedEncryption::NotVerified(err) =
+                has_verified_encryption(context, mime_parser, from_id, to_ids, chat.typ).await?
             {
                 warn!(context, "Verification problem: {err:#}.");
                 let s = format!("{err}. See 'Info' for more details");
                 mime_parser.repl_msg_by_error(&s);
-            } else {
-                // change chat protection only when verification check passes
-                if let Some(new_status) = new_status {
-                    if chat_id
-                        .update_timestamp(
-                            context,
-                            Param::ProtectionSettingsTimestamp,
-                            sent_timestamp,
-                        )
-                        .await?
-                    {
-                        if let Err(e) = chat_id.inner_set_protection(context, new_status).await {
-                            chat::add_info_msg(
-                                context,
-                                chat_id,
-                                &format!("Cannot set protection: {e}"),
-                                sort_timestamp,
-                            )
-                            .await?;
-                            // do not return an error as this would result in retrying the message
-                        }
-                    }
-                    better_msg = Some(context.stock_protection_msg(new_status, from_id).await);
-                }
             }
         }
     }
@@ -1184,8 +1194,9 @@ 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
 "#)?;
-                stmt.execute(params![
+                let row_id: MsgId = stmt.query_row(params![
                     replace_msg_id,
                     rfc724_mid,
                     if trash { DC_CHAT_ID_TRASH } else { chat_id },
@@ -1224,8 +1235,12 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
                         DownloadState::Done
                     },
                     mime_parser.hop_info
-                ])?;
-                let row_id = conn.last_insert_rowid();
+                ],
+                |row| {
+                    let msg_id: MsgId = row.get(0)?;
+                    Ok(msg_id)
+                }
+                )?;
                 Ok(row_id)
             })
             .await?;
@@ -1234,7 +1249,8 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
         // afterwards insert additional parts.
         replace_msg_id = None;
 
-        created_db_entries.push(MsgId::new(u32::try_from(row_id)?));
+        debug_assert!(!row_id.is_special());
+        created_db_entries.push(row_id);
     }
 
     // check all parts whether they contain a new logging webxdc
@@ -1526,7 +1542,9 @@ async fn create_or_lookup_group(
     }
 
     let create_protected = if mime_parser.get_header(HeaderDef::ChatVerified).is_some() {
-        if let Err(err) = check_verified_properties(context, mime_parser, from_id, to_ids).await {
+        if let VerifiedEncryption::NotVerified(err) =
+            has_verified_encryption(context, mime_parser, from_id, to_ids, Chattype::Group).await?
+        {
             warn!(context, "Verification problem: {err:#}.");
             let s = format!("{err}. See 'Info' for more details");
             mime_parser.repl_msg_by_error(&s);
@@ -1688,6 +1706,13 @@ async fn apply_group_changes(
 
     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.
@@ -1695,12 +1720,6 @@ 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,
@@ -1711,6 +1730,8 @@ 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 {
@@ -1723,8 +1744,6 @@ 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}.");
         }
@@ -1773,20 +1792,6 @@ async fn apply_group_changes(
         }
     }
 
-    if mime_parser.get_header(HeaderDef::ChatVerified).is_some() {
-        if let Err(err) = check_verified_properties(context, mime_parser, from_id, to_ids).await {
-            warn!(context, "Verification problem: {err:#}.");
-            let s = format!("{err}. See 'Info' for more details");
-            mime_parser.repl_msg_by_error(&s);
-        }
-
-        if !chat.is_protected() {
-            chat_id
-                .inner_set_protection(context, ProtectionStatus::Protected)
-                .await?;
-        }
-    }
-
     // Recreate the member list.
     if recreate_member_list {
         if !chat::is_contact_in_chat(context, chat_id, from_id).await? {
@@ -2011,7 +2016,7 @@ async fn apply_mailinglist_changes(
         };
         let (contact_id, _) =
             Contact::add_or_lookup(context, "", list_post, Origin::Hidden).await?;
-        let mut contact = Contact::load_from_db(context, contact_id).await?;
+        let mut contact = Contact::get_by_id(context, contact_id).await?;
         if contact.param.get(Param::ListId) != Some(listid) {
             contact.param.set(Param::ListId, listid);
             contact.update_param(context).await?;
@@ -2123,49 +2128,53 @@ async fn create_adhoc_group(
     Ok(Some(new_chat_id))
 }
 
-async fn check_verified_properties(
+enum VerifiedEncryption {
+    Verified,
+    NotVerified(String), // The string contains the reason why it's not verified
+}
+
+/// Checks whether the message is allowed to appear in a protected chat.
+///
+/// This means that it is encrypted, signed with a verified key,
+/// and if it's a group, all the recipients are verified.
+async fn has_verified_encryption(
     context: &Context,
     mimeparser: &MimeMessage,
     from_id: ContactId,
     to_ids: &[ContactId],
-) -> Result<()> {
-    let contact = Contact::load_from_db(context, from_id).await?;
+    chat_type: Chattype,
+) -> Result<VerifiedEncryption> {
+    use VerifiedEncryption::*;
 
-    ensure!(mimeparser.was_encrypted(), "This message is not encrypted");
-
-    if mimeparser.get_header(HeaderDef::ChatVerified).is_none() {
-        // we do not fail here currently, this would exclude (a) non-deltas
-        // and (b) deltas with different protection views across multiple devices.
-        // for group creation or protection enabled/disabled, however, Chat-Verified is respected.
-        warn!(
-            context,
-            "{} did not mark message as protected.",
-            contact.get_addr()
-        );
+    if from_id == ContactId::SELF && chat_type == Chattype::Single {
+        // For outgoing emails in the 1:1 chat, we have an exception that
+        // they are allowed to be unencrypted:
+        // 1. They can't be an attack (they are outgoing, not incoming)
+        // 2. Probably the unencryptedness is just a temporary state, after all
+        //    the user obviously still uses DC
+        //    -> Showing info messages everytime would be a lot of noise
+        // 3. The info messages that are shown to the user ("Your chat partner
+        //    likely reinstalled DC" or similar) would be wrong.
+        return Ok(Verified);
     }
 
+    if !mimeparser.was_encrypted() {
+        return Ok(NotVerified("This message is not encrypted".to_string()));
+    };
+
     // ensure, the contact is verified
     // and the message is signed with a verified key of the sender.
     // this check is skipped for SELF as there is no proper SELF-peerstate
     // and results in group-splits otherwise.
     if from_id != ContactId::SELF {
-        let peerstate = Peerstate::from_addr(context, contact.get_addr()).await?;
+        let Some(peerstate) = &mimeparser.decryption_info.peerstate else {
+            return Ok(NotVerified("No peerstate, the contact isn't verified".to_string()));
+        };
 
-        if peerstate.is_none()
-            || contact.is_verified_ex(context, peerstate.as_ref()).await?
-                != VerifiedStatus::BidirectVerified
-        {
-            bail!(
-                "Sender of this message is not verified: {}",
-                contact.get_addr()
-            );
-        }
-
-        if let Some(peerstate) = peerstate {
-            ensure!(
-                peerstate.has_verified_key(&mimeparser.signatures),
-                "The message was sent with non-verified encryption"
-            );
+        if !peerstate.has_verified_key(&mimeparser.signatures) {
+            return Ok(NotVerified(
+                "The message was sent with non-verified encryption".to_string(),
+            ));
         }
     }
 
@@ -2177,7 +2186,7 @@ async fn check_verified_properties(
         .collect::<Vec<ContactId>>();
 
     if to_ids.is_empty() {
-        return Ok(());
+        return Ok(Verified);
     }
 
     let rows = context
@@ -2201,10 +2210,12 @@ async fn check_verified_properties(
         )
         .await?;
 
+    let contact = Contact::get_by_id(context, from_id).await?;
+
     for (to_addr, mut is_verified) in rows {
         info!(
             context,
-            "check_verified_properties: {:?} self={:?}.",
+            "has_verified_encryption: {:?} self={:?}.",
             to_addr,
             context.is_self_addr(&to_addr).await
         );
@@ -2238,13 +2249,13 @@ async fn check_verified_properties(
             }
         }
         if !is_verified {
-            bail!(
+            return Ok(NotVerified(format!(
                 "{} is not a member of this protected chat",
-                to_addr.to_string()
-            );
+                to_addr
+            )));
         }
     }
-    Ok(())
+    Ok(Verified)
 }
 
 /// Returns the last message referenced from `References` header if it is in the database.
@@ -2343,7 +2354,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.iter() {
+    for info in address_list {
         let addr = &info.addr;
         if !may_be_valid_addr(addr) {
             continue;

src/receive_imf/tests.rs

@@ -250,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.unwrap(), "hello");
+    assert_eq!(msg.text, "hello");
     assert_eq!(msg.state, MessageState::OutDelivered);
     let group = Chat::load_from_db(&t, group_id).await?;
     assert!(group.get_visibility() == ChatVisibility::Normal);
@@ -407,7 +407,7 @@ async fn test_escaped_from() {
             false,
         ).await.unwrap();
     assert_eq!(
-        Contact::load_from_db(&t, contact_id)
+        Contact::get_by_id(&t, contact_id)
             .await
             .unwrap()
             .get_authname(),
@@ -415,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.unwrap(), "hello");
+    assert_eq!(msg.text, "hello");
     assert_eq!(msg.param.get_int(Param::WantsMdn).unwrap(), 1);
 }
 
@@ -452,7 +452,7 @@ async fn test_escaped_recipients() {
     )
     .await
     .unwrap();
-    let contact = Contact::load_from_db(&t, carl_contact_id).await.unwrap();
+    let contact = Contact::get_by_id(&t, carl_contact_id).await.unwrap();
     assert_eq!(contact.get_name(), "");
     assert_eq!(contact.get_display_name(), "h2");
 
@@ -461,7 +461,7 @@ async fn test_escaped_recipients() {
         .await
         .unwrap();
     assert_eq!(msg.is_dc_message, MessengerMessage::Yes);
-    assert_eq!(msg.text.unwrap(), "hello");
+    assert_eq!(msg.text, "hello");
     assert_eq!(msg.param.get_int(Param::WantsMdn).unwrap(), 1);
 }
 
@@ -499,7 +499,7 @@ async fn test_cc_to_contact() {
     )
     .await
     .unwrap();
-    let contact = Contact::load_from_db(&t, carl_contact_id).await.unwrap();
+    let contact = Contact::get_by_id(&t, carl_contact_id).await.unwrap();
     assert_eq!(contact.get_name(), "");
     assert_eq!(contact.get_display_name(), "Carl");
 }
@@ -713,7 +713,7 @@ async fn test_parse_ndn_group_msg() -> Result<()> {
 
     assert_eq!(
         last_msg.text,
-        Some(stock_str::failed_sending_to(&t, "assidhfaaspocwaeofi@gmail.com").await,)
+        stock_str::failed_sending_to(&t, "assidhfaaspocwaeofi@gmail.com").await
     );
     assert_eq!(last_msg.from_id, ContactId::INFO);
     Ok(())
@@ -734,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.unwrap(), "   Guten Abend,   \n\n   Lots of text   \n\n   text with Umlaut ä...   \n\n   MfG    [...]");
+    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");
 }
 
 static GH_MAILINGLIST: &[u8] =
@@ -797,12 +797,12 @@ async fn test_github_mailing_list() -> Result<()> {
     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::load_from_db(&t.ctx, msg1.from_id).await?;
+    let contact1 = Contact::get_by_id(&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::load_from_db(&t.ctx, msg2.from_id).await?;
+    let contact2 = Contact::get_by_id(&t.ctx, msg2.from_id).await?;
     assert_eq!(contact2.get_addr(), "notifications@github.com");
 
     assert_eq!(msg1.get_override_sender_name().unwrap(), "Max Mustermann");
@@ -847,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::load_from_db(&t.ctx, msg.from_id).await.unwrap();
+    let contact1 = Contact::get_by_id(&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;
@@ -890,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::load_from_db(&t, list_post_contact_id).await?;
+    let list_post_contact = Contact::get_by_id(&t, list_post_contact_id).await?;
     assert_eq!(
         list_post_contact.param.get(Param::ListId).unwrap(),
         "delta.codespeak.net"
@@ -1158,10 +1158,7 @@ async fn test_dhl_mailing_list() -> Result<()> {
     .await
     .unwrap();
     let msg = t.get_last_msg().await;
-    assert_eq!(
-        msg.text,
-        Some("Ihr Paket ist in der Packstation 123 – bla bla".to_string())
-    );
+    assert_eq!(msg.text, "Ihr Paket ist in der Packstation 123 – bla bla");
     assert!(msg.has_html());
     let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
     assert_eq!(chat.typ, Chattype::Mailinglist);
@@ -1186,10 +1183,7 @@ async fn test_dpd_mailing_list() -> Result<()> {
     .await
     .unwrap();
     let msg = t.get_last_msg().await;
-    assert_eq!(
-        msg.text,
-        Some("Bald ist Ihr DPD Paket da – bla bla".to_string())
-    );
+    assert_eq!(msg.text, "Bald ist Ihr DPD Paket da – bla bla");
     assert!(msg.has_html());
     let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
     assert_eq!(chat.typ, Chattype::Mailinglist);
@@ -1294,10 +1288,7 @@ async fn test_mailing_list_with_mimepart_footer() {
     .await
     .unwrap();
     let msg = t.get_last_msg().await;
-    assert_eq!(
-        msg.text,
-        Some("[Intern] important stuff – Hi mr ... [text part]".to_string())
-    );
+    assert_eq!(msg.text, "[Intern] important stuff – Hi mr ... [text part]");
     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);
@@ -1320,7 +1311,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().unwrap();
+    let text = msg.text.clone();
     assert!(text.contains("content text"));
     assert!(!text.contains("footer text"));
     assert!(msg.has_html());
@@ -1365,7 +1356,7 @@ async fn test_apply_mailinglist_changes_assigned_by_reply() {
     .await
     .unwrap()
     .unwrap();
-    let contact = Contact::load_from_db(&t, contact_id).await.unwrap();
+    let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
     assert_eq!(
         contact.param.get(Param::ListId).unwrap(),
         "deltachat-core-rust.deltachat.github.com"
@@ -1384,7 +1375,7 @@ async fn test_mailing_list_chat_message() {
     .await
     .unwrap();
     let msg = t.get_last_msg().await;
-    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_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!(!msg.has_html());
     let chat = Chat::load_from_db(&t, msg.chat_id).await.unwrap();
     assert_eq!(chat.typ, Chattype::Mailinglist);
@@ -1464,7 +1455,7 @@ async fn test_pdf_filename_simple() {
     )
     .await;
     assert_eq!(msg.viewtype, Viewtype::File);
-    assert_eq!(msg.text.unwrap(), "mail body");
+    assert_eq!(msg.text, "mail body");
     assert_eq!(msg.param.get(Param::File).unwrap(), "$BLOBDIR/simple.pdf");
 }
 
@@ -1478,7 +1469,7 @@ async fn test_pdf_filename_continuation() {
     )
     .await;
     assert_eq!(msg.viewtype, Viewtype::File);
-    assert_eq!(msg.text.unwrap(), "mail body");
+    assert_eq!(msg.text, "mail body");
     assert_eq!(
         msg.param.get(Param::File).unwrap(),
         "$BLOBDIR/test pdf äöüß.pdf"
@@ -1557,7 +1548,7 @@ async fn test_in_reply_to() {
     .unwrap();
 
     let msg = t.get_last_msg().await;
-    assert_eq!(msg.get_text().unwrap(), "reply foo");
+    assert_eq!(msg.get_text(), "reply foo");
 
     // Load the first message from the same chat.
     let msgs = chat::get_chat_msgs(&t, msg.chat_id).await.unwrap();
@@ -1568,7 +1559,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().unwrap(), "hello foo");
+    assert_eq!(reply_msg.get_text(), "hello foo");
 
     // Check that reply got into the same chat as the original message.
     assert_eq!(msg.chat_id, reply_msg.chat_id);
@@ -1626,7 +1617,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().unwrap(), "classic reply");
+    assert_eq!(msg.get_text(), "classic reply");
 
     // Receive a Delta Chat reply from Alice.
     // It is assigned to group chat, because it has a group ID.
@@ -1652,7 +1643,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().unwrap(), "chat reply");
+    assert_eq!(msg.get_text(), "chat reply");
 
     // Receive a private Delta Chat reply from Alice.
     // It is assigned to 1:1 chat, because it has no group ID,
@@ -1679,7 +1670,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().unwrap(), "private reply");
+    assert_eq!(msg.get_text(), "private reply");
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1690,7 +1681,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(), Some("hi!".to_string()));
+    assert_eq!(msg.get_text(), "hi!");
     assert!(!msg.get_showpadlock());
     let mime = message::get_mime_headers(&bob, msg.id).await?;
     assert!(mime.is_empty());
@@ -1709,7 +1700,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(), Some("hi!".to_string()));
+    assert_eq!(msg.get_text(), "hi!");
     assert!(!msg.get_showpadlock());
     let mime = message::get_mime_headers(&bob, msg.id).await?;
     let mime_str = String::from_utf8_lossy(&mime);
@@ -1720,7 +1711,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(), Some("ho!".to_string()));
+    assert_eq!(msg.get_text(), "ho!");
     assert!(msg.get_showpadlock());
     let mime = message::get_mime_headers(&alice, msg.id).await?;
     let mime_str = String::from_utf8_lossy(&mime);
@@ -1780,7 +1771,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().unwrap().contains("hi support!"));
+    assert!(msg.get_text().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);
@@ -1805,7 +1796,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().unwrap().contains("hi support!"));
+    assert!(msg.get_text().contains("hi support!"));
     let chat = Chat::load_from_db(&claire, msg.chat_id).await.unwrap();
     if group_request {
         assert_eq!(chat.typ, Chattype::Group);
@@ -1826,7 +1817,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().unwrap().contains("the version is 1.0"));
+    assert!(answer.get_text().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
@@ -1849,7 +1840,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().unwrap().contains("the version is 1.0"));
+    assert!(answer.get_text().contains("the version is 1.0"));
     assert_eq!(answer.chat_id, request.chat_id);
     assert_eq!(
         answer.get_override_sender_name().unwrap(),
@@ -1921,7 +1912,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.unwrap(), "Hi – hello");
+    assert_eq!(msg.text, "Hi – hello");
 
     println!("\n========= Delete the message ==========");
     msg.id.trash(&t).await.unwrap();
@@ -1945,7 +1936,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.unwrap(), "Reply");
+    assert_eq!(msg.text, "Reply");
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1996,7 +1987,7 @@ Message content",
 
     // Outgoing email should create a chat.
     let msg = alice.get_last_msg().await;
-    assert_eq!(msg.get_text().unwrap(), "Subj – Message content");
+    assert_eq!(msg.get_text(), "Subj – Message content");
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -2038,12 +2029,12 @@ Message content
 Second signature";
 
     receive_imf(&alice, first_message, false).await?;
-    let contact = Contact::load_from_db(&alice, bob_contact_id).await?;
+    let contact = Contact::get_by_id(&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::load_from_db(&alice, bob_contact_id).await?;
+    let contact = Contact::get_by_id(&alice, bob_contact_id).await?;
     assert_eq!(contact.get_status(), "Second signature");
     assert_eq!(contact.get_display_name(), "Bob2");
 
@@ -2051,7 +2042,7 @@ Second signature";
     receive_imf(&alice, first_message, false).await?;
 
     // No change because last message is duplicate of the first.
-    let contact = Contact::load_from_db(&alice, bob_contact_id).await?;
+    let contact = Contact::get_by_id(&alice, bob_contact_id).await?;
     assert_eq!(contact.get_status(), "Second signature");
     assert_eq!(contact.get_display_name(), "Bob2");
 
@@ -2069,7 +2060,7 @@ async fn test_ignore_footer_status_from_mailinglist() -> Result<()> {
     )
     .await?
     .0;
-    let bob = Contact::load_from_db(&t, bob_id).await?;
+    let bob = Contact::get_by_id(&t, bob_id).await?;
     assert_eq!(bob.get_status(), "");
     assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 0);
 
@@ -2089,7 +2080,7 @@ Original signature",
     .await?;
     let msg = t.get_last_msg().await;
     let one2one_chat_id = msg.chat_id;
-    let bob = Contact::load_from_db(&t, bob_id).await?;
+    let bob = Contact::get_by_id(&t, bob_id).await?;
     assert_eq!(bob.get_status(), "Original signature");
     assert!(!msg.has_html());
 
@@ -2112,7 +2103,7 @@ Tap here to unsubscribe ...",
     )
     .await?;
     let ml_chat_id = t.get_last_msg().await.chat_id;
-    let bob = Contact::load_from_db(&t, bob_id).await?;
+    let bob = Contact::get_by_id(&t, bob_id).await?;
     assert_eq!(bob.get_status(), "Original signature");
 
     receive_imf(
@@ -2129,7 +2120,7 @@ Original signature updated",
         false,
     )
     .await?;
-    let bob = Contact::load_from_db(&t, bob_id).await?;
+    let bob = Contact::get_by_id(&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);
@@ -2164,7 +2155,7 @@ sig wednesday",
     )
     .await?;
     let chat_id = t.get_last_msg().await.chat_id;
-    let bob = Contact::load_from_db(&t, bob_id).await?;
+    let bob = Contact::get_by_id(&t, bob_id).await?;
     assert_eq!(bob.get_status(), "sig wednesday");
     assert_eq!(get_chat_msgs(&t, chat_id).await?.len(), 1);
 
@@ -2182,7 +2173,7 @@ sig tuesday",
         false,
     )
     .await?;
-    let bob = Contact::load_from_db(&t, bob_id).await?;
+    let bob = Contact::get_by_id(&t, bob_id).await?;
     assert_eq!(bob.get_status(), "sig wednesday");
     assert_eq!(get_chat_msgs(&t, chat_id).await?.len(), 2);
 
@@ -2200,7 +2191,7 @@ sig thursday",
         false,
     )
     .await?;
-    let bob = Contact::load_from_db(&t, bob_id).await?;
+    let bob = Contact::get_by_id(&t, bob_id).await?;
     assert_eq!(bob.get_status(), "sig thursday");
     assert_eq!(get_chat_msgs(&t, chat_id).await?.len(), 3);
 
@@ -2243,7 +2234,7 @@ Message-ID: <Gr.eJ_llQIXf0K.buxmrnMmG0Y@gmx.de>"
 
         let group_msg = t.get_last_msg().await;
         assert_eq!(
-            group_msg.text.unwrap(),
+            group_msg.text,
             if *outgoing_is_classical {
                 "single reply-to – Hello, I\'ve just created the group \"single reply-to\" for us."
             } else {
@@ -2283,7 +2274,7 @@ Private reply"#,
         .unwrap();
 
         let private_msg = t.get_last_msg().await;
-        assert_eq!(private_msg.text.unwrap(), "Private reply");
+        assert_eq!(private_msg.text, "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);
@@ -2332,7 +2323,7 @@ Message-ID: <Gr.iy1KCE2y65_.mH2TM52miv9@testrun.org>"
         .unwrap();
         let group_msg = t.get_last_msg().await;
         assert_eq!(
-            group_msg.text.unwrap(),
+            group_msg.text,
             if *outgoing_is_classical {
                 "single reply-to – Hello, I\'ve just created the group \"single reply-to\" for us."
             } else {
@@ -2378,7 +2369,7 @@ Sent with my Delta Chat Messenger: https://delta.chat
         .unwrap();
 
         let private_msg = t.get_last_msg().await;
-        assert_eq!(private_msg.text.unwrap(), "Private reply");
+        assert_eq!(private_msg.text, "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);
@@ -2420,7 +2411,7 @@ Message-ID: <Gr.eJ_llQIXf0K.buxmrnMmG0Y@gmx.de>"
 
         let group_msg = t.get_last_msg().await;
         assert_eq!(
-            group_msg.text.unwrap(),
+            group_msg.text,
             if *outgoing_is_classical {
                 "single reply-to – Hello, I\'ve just created the group \"single reply-to\" for us."
             } else {
@@ -2457,7 +2448,7 @@ Outgoing reply to all"#,
         .unwrap();
 
         let reply = t.get_last_msg().await;
-        assert_eq!(reply.text.unwrap(), "Out subj – Outgoing reply to all");
+        assert_eq!(reply.text, "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);
@@ -2480,7 +2471,7 @@ Reply to all"#,
         .unwrap();
 
         let reply = t.get_last_msg().await;
-        assert_eq!(reply.text.unwrap(), "In subj – Reply to all");
+        assert_eq!(reply.text, "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);
@@ -2766,7 +2757,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.unwrap(), "Hi, I created a group");
+    assert_eq!(msg_out.text, "Hi, I created a group");
     assert_eq!(msg_out.in_reply_to, None);
 
     // Bob replies from a different address
@@ -2790,7 +2781,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.unwrap(), "Reply from different address");
+    assert_eq!(msg_in.text, "Reply from different address");
     assert_eq!(
         msg_in.in_reply_to.unwrap(),
         "Gr.qetqsutor7a.Aresxresy-4@deltachat.de"
@@ -2868,22 +2859,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.unwrap(), "Hello!");
+    assert_eq!(alice1_msg.text, "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.unwrap(), "Hello!");
+    assert_eq!(alice2_msg.text, "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.unwrap(), "Hello!");
+    assert_eq!(bob1_msg.text, "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.unwrap(), "Hello!");
+    assert_eq!(bob2_msg.text, "Hello!");
     let bob2_chat = chat::Chat::load_from_db(&bob2, bob2_msg.chat_id).await?;
     assert!(!bob2_chat.is_contact_request());
 
@@ -2929,7 +2920,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, Some("Hello all!".to_string()));
+    assert_eq!(received.text, "Hello all!");
     assert_eq!(received.in_reply_to, None);
     assert_eq!(received.chat_blocked, Blocked::Request);
 
@@ -2939,7 +2930,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(Some("Private reply".to_string()));
+    msg_out.set_text("Private reply".to_string());
 
     assert_eq!(received_group.blocked, Blocked::Request);
     msg_out.set_quote(&alice1, Some(&received)).await?;
@@ -2957,10 +2948,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, Some("Private reply".to_string()));
+    assert_eq!(received.text, "Private reply");
     assert_eq!(
         received.parent(&alice2).await?.unwrap().text,
-        Some("Hello all!".to_string())
+        "Hello all!".to_string()
     );
     assert_eq!(received.chat_blocked, Blocked::Not);
 
@@ -3021,13 +3012,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, Some("Hello all!".to_string()));
+    assert_eq!(received.text, "Hello all!");
 
     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(Some("Private reply".to_string()));
+    msg_out.set_text("Private reply".to_string());
     msg_out.set_quote(&alice, Some(&received)).await?;
 
     let alice_bob_chat = alice.create_chat(&bob).await;
@@ -3043,7 +3034,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, Some("Hello all!".to_string()));
+    assert_eq!(received.text, "Hello all!");
 
     // =============== Bob unblocks Alice ================
     // test if the blocked chat is restored correctly
@@ -3054,7 +3045,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, Some("Private reply".to_string()));
+    assert_eq!(received.text, "Private reply");
 
     Ok(())
 }

src/scheduler.rs

@@ -864,7 +864,7 @@ impl Scheduler {
 
         // Actually shutdown tasks.
         let timeout_duration = std::time::Duration::from_secs(30);
-        for b in once(self.inbox).chain(self.oboxes.into_iter()) {
+        for b in once(self.inbox).chain(self.oboxes) {
             tokio::time::timeout(timeout_duration, b.handle)
                 .await
                 .log_err(context)

src/securejoin.rs

@@ -6,7 +6,7 @@ use anyhow::{bail, Context as _, Error, Result};
 use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
 
 use crate::aheader::EncryptPreference;
-use crate::chat::{self, Chat, ChatId, ChatIdBlocked};
+use crate::chat::{self, Chat, ChatId, ChatIdBlocked, ProtectionStatus};
 use crate::config::Config;
 use crate::constants::Blocked;
 use crate::contact::{Contact, ContactId, Origin, VerifiedStatus};
@@ -178,7 +178,7 @@ async fn send_alice_handshake_msg(
 ) -> Result<()> {
     let mut msg = Message {
         viewtype: Viewtype::Text,
-        text: Some(format!("Secure-Join: {step}")),
+        text: 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::load_from_db(context, contact_id).await?;
+    let contact = Contact::get_by_id(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::load_from_db(context, contact_id)
+            let contact_addr = Contact::get_by_id(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::load_from_db(context, contact_id)
+            let addr = Contact::get_by_id(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::load_from_db(context, contact_id)
+                    Contact::get_by_id(context, contact_id)
                         .await?
                         .get_addr()
                         .to_owned(),
@@ -701,6 +701,14 @@ async fn secure_connection_established(
     let contact = Contact::get_by_id(context, contact_id).await?;
     let msg = stock_str::contact_verified(context, &contact).await;
     chat::add_info_msg(context, chat_id, &msg, time()).await?;
+    chat_id
+        .set_protection(
+            context,
+            ProtectionStatus::Protected,
+            time(),
+            Some(contact_id),
+        )
+        .await?;
     context.emit_event(EventType::ChatModified(chat_id));
     Ok(())
 }
@@ -783,6 +791,8 @@ mod tests {
     use crate::contact::VerifiedStatus;
     use crate::peerstate::Peerstate;
     use crate::receive_imf::receive_imf;
+    use crate::stock_str::chat_protection_enabled;
+    use crate::test_utils::get_chat_msg;
     use crate::test_utils::{TestContext, TestContextManager};
     use crate::tools::EmailAddress;
 
@@ -889,7 +899,7 @@ mod tests {
                 .await
                 .expect("Error looking up contact")
                 .expect("Contact not found");
-        let contact_bob = Contact::load_from_db(&alice.ctx, contact_bob_id)
+        let contact_bob = Contact::get_by_id(&alice.ctx, contact_bob_id)
             .await
             .unwrap();
         assert_eq!(
@@ -921,7 +931,7 @@ mod tests {
         // Check Alice got the verified message in her 1:1 chat.
         {
             let chat = alice.create_chat(&bob).await;
-            let msg_id = chat::get_chat_msgs(&alice.ctx, chat.get_id())
+            let msg_ids: Vec<_> = chat::get_chat_msgs(&alice.ctx, chat.get_id())
                 .await
                 .unwrap()
                 .into_iter()
@@ -929,12 +939,17 @@ mod tests {
                     chat::ChatItem::Message { msg_id } => Some(msg_id),
                     _ => None,
                 })
-                .max()
-                .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());
-            let text = msg.get_text().unwrap();
-            assert!(text.contains("bob@example.net verified"));
+                .collect();
+            assert_eq!(msg_ids.len(), 2);
+
+            let msg0 = Message::load_from_db(&alice.ctx, msg_ids[0]).await.unwrap();
+            assert!(msg0.is_info());
+            assert!(msg0.get_text().contains("bob@example.net verified"));
+
+            let msg1 = Message::load_from_db(&alice.ctx, msg_ids[1]).await.unwrap();
+            assert!(msg1.is_info());
+            let expected_text = chat_protection_enabled(&alice).await;
+            assert_eq!(msg1.get_text(), expected_text);
         }
 
         // Check Alice sent the right message to Bob.
@@ -952,7 +967,7 @@ mod tests {
                 .await
                 .expect("Error looking up contact")
                 .expect("Contact not found");
-        let contact_alice = Contact::load_from_db(&bob.ctx, contact_alice_id)
+        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id)
             .await
             .unwrap();
         assert_eq!(
@@ -970,7 +985,7 @@ mod tests {
         // Check Bob got the verified message in his 1:1 chat.
         {
             let chat = bob.create_chat(&alice).await;
-            let msg_id = chat::get_chat_msgs(&bob.ctx, chat.get_id())
+            let msg_ids: Vec<_> = chat::get_chat_msgs(&bob.ctx, chat.get_id())
                 .await
                 .unwrap()
                 .into_iter()
@@ -978,12 +993,16 @@ mod tests {
                     chat::ChatItem::Message { msg_id } => Some(msg_id),
                     _ => None,
                 })
-                .max()
-                .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());
-            let text = msg.get_text().unwrap();
-            assert!(text.contains("alice@example.org verified"));
+                .collect();
+
+            let msg0 = Message::load_from_db(&bob.ctx, msg_ids[0]).await.unwrap();
+            assert!(msg0.is_info());
+            assert!(msg0.get_text().contains("alice@example.org verified"));
+
+            let msg1 = Message::load_from_db(&bob.ctx, msg_ids[1]).await.unwrap();
+            assert!(msg1.is_info());
+            let expected_text = chat_protection_enabled(&bob).await;
+            assert_eq!(msg1.get_text(), expected_text);
         }
 
         // Check Bob sent the final message
@@ -1078,7 +1097,7 @@ mod tests {
             Origin::ManuallyCreated,
         )
         .await?;
-        let contact_bob = Contact::load_from_db(&alice.ctx, contact_bob_id).await?;
+        let contact_bob = Contact::get_by_id(&alice.ctx, contact_bob_id).await?;
         assert_eq!(
             contact_bob.is_verified(&alice.ctx).await?,
             VerifiedStatus::Unverified
@@ -1105,7 +1124,7 @@ mod tests {
                 .await
                 .expect("Error looking up contact")
                 .expect("Contact not found");
-        let contact_alice = Contact::load_from_db(&bob.ctx, contact_alice_id).await?;
+        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id).await?;
         assert_eq!(
             contact_bob.is_verified(&bob.ctx).await?,
             VerifiedStatus::Unverified
@@ -1246,7 +1265,7 @@ mod tests {
             Contact::lookup_id_by_addr(&alice.ctx, "bob@example.net", Origin::Unknown)
                 .await?
                 .expect("Contact not found");
-        let contact_bob = Contact::load_from_db(&alice.ctx, contact_bob_id).await?;
+        let contact_bob = Contact::get_by_id(&alice.ctx, contact_bob_id).await?;
         assert_eq!(
             contact_bob.is_verified(&alice.ctx).await?,
             VerifiedStatus::Unverified
@@ -1280,20 +1299,13 @@ mod tests {
                 Blocked::Yes,
                 "Alice's 1:1 chat with Bob is not hidden"
             );
-            let msg_id = chat::get_chat_msgs(&alice.ctx, alice_chatid)
-                .await
-                .unwrap()
-                .into_iter()
-                .filter_map(|item| match item {
-                    chat::ChatItem::Message { msg_id } => Some(msg_id),
-                    _ => None,
-                })
-                .min()
-                .expect("No messages in Alice's group chat");
-            let msg = Message::load_from_db(&alice.ctx, msg_id).await.unwrap();
+            // There should be 3 messages in the chat:
+            // - The ChatProtectionEnabled message
+            // - bob@example.net verified
+            // - You added member bob@example.net
+            let msg = get_chat_msg(&alice, alice_chatid, 1, 3).await;
             assert!(msg.is_info());
-            let text = msg.get_text().unwrap();
-            assert!(text.contains("bob@example.net verified"));
+            assert!(msg.get_text().contains("bob@example.net verified"));
         }
 
         // Bob should not yet have Alice verified
@@ -1302,7 +1314,7 @@ mod tests {
                 .await
                 .expect("Error looking up contact")
                 .expect("Contact not found");
-        let contact_alice = Contact::load_from_db(&bob.ctx, contact_alice_id).await?;
+        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id).await?;
         assert_eq!(
             contact_bob.is_verified(&bob.ctx).await?,
             VerifiedStatus::Unverified
@@ -1328,7 +1340,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().unwrap();
+                    let text = msg.get_text();
                     println!("msg {msg_id} text: {text}");
                 }
             }
@@ -1340,7 +1352,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().unwrap();
+                        let text = msg.get_text();
                         match text.contains("alice@example.org verified") {
                             true => {
                                 assert!(msg.is_info());

src/securejoin/bob.rs

@@ -222,6 +222,14 @@ impl BobState {
         let msg = stock_str::contact_verified(context, &contact).await;
         let chat_id = self.joining_chat_id(context).await?;
         chat::add_info_msg(context, chat_id, &msg, time()).await?;
+        chat_id
+            .set_protection(
+                context,
+                ProtectionStatus::Protected,
+                time(),
+                Some(contact.id),
+            )
+            .await?;
         context.emit_event(EventType::ChatModified(chat_id));
         Ok(())
     }

src/securejoin/bobstate.rs

@@ -422,7 +422,7 @@ async fn send_handshake_message(
 ) -> Result<()> {
     let mut msg = Message {
         viewtype: Viewtype::Text,
-        text: Some(step.body_text(invite)),
+        text: step.body_text(invite),
         hidden: true,
         ..Default::default()
     };

src/simplify.rs

@@ -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)]
+#[derive(Debug, Default, PartialEq, Eq)]
 pub(crate) struct SimplifiedText {
     /// The text itself.
     pub text: String,
@@ -91,6 +91,14 @@ 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 {
@@ -125,11 +133,9 @@ pub(crate) fn simplify(mut input: String, is_chat_message: bool) -> SimplifiedTe
 
     if !is_chat_message {
         top_quote = top_quote.map(|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)
+            let (quote, quote_cut) = simplify_quote(&quote);
+            is_cut |= quote_cut;
+            quote
         });
     }
 
@@ -235,12 +241,11 @@ fn render_message(lines: &[&str], is_cut_at_end: bool) -> String {
     let mut ret = String::new();
     /* we write empty lines only in case and non-empty line follows */
     let mut pending_linebreaks = 0;
-    let mut empty_body = true;
     for line in lines {
         if is_empty_line(line) {
             pending_linebreaks += 1
         } else {
-            if !empty_body {
+            if !ret.is_empty() {
                 if pending_linebreaks > 2 {
                     pending_linebreaks = 2
                 }
@@ -251,11 +256,10 @@ fn render_message(lines: &[&str], is_cut_at_end: bool) -> String {
             }
             // the incoming message might contain invalid UTF8
             ret += line;
-            empty_body = false;
             pending_linebreaks = 1
         }
     }
-    if is_cut_at_end && !empty_body {
+    if is_cut_at_end && !ret.is_empty() {
         ret += " [...]";
     }
     // redo escaping done by escape_message_footer_marks()

src/smtp.rs

@@ -55,7 +55,7 @@ impl Smtp {
     }
 
     /// Disconnect the SMTP transport and drop it entirely.
-    pub async fn disconnect(&mut self) {
+    pub 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().await;
+            self.disconnect();
         }
 
         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().await;
+            smtp.disconnect();
 
             res
         }
         Err(crate::smtp::send::Error::Envelope(err)) => {
             // Local error, job is invalid, do not retry.
-            smtp.disconnect().await;
+            smtp.disconnect();
             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().await;
+            smtp.disconnect();
             warn!(context, "unable to load job: {}", err);
             SendResult::Failure(err)
         }
@@ -683,7 +683,7 @@ async fn send_mdn_msg_id(
     contact_id: ContactId,
     smtp: &mut Smtp,
 ) -> Result<()> {
-    let contact = Contact::load_from_db(context, contact_id).await?;
+    let contact = Contact::get_by_id(context, contact_id).await?;
     if contact.is_blocked() {
         return Err(format_err!("Contact is blocked"));
     }

src/sql.rs

@@ -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.text = Some(stock_str::delete_server_turned_off(context).await);
+                msg.set_text(stock_str::delete_server_turned_off(context).await);
                 add_device_msg(context, None, Some(&mut msg)).await?;
                 context
                     .set_config(Config::DeleteServerAfter, Some("0"))
@@ -755,6 +755,17 @@ 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(())
 }
@@ -1102,13 +1113,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(Some("This is my draft".to_string()));
+        new_draft.set_text("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.unwrap(), "This is my draft");
+        assert_eq!(loaded_draft.unwrap().text, "This is my draft");
     }
 
     /// Tests that `housekeeping` deletes the blobs backup dir which is created normally by

src/stock_str.rs

@@ -393,23 +393,26 @@ pub enum StockMessage {
     #[strum(props(fallback = "Message deletion timer is set to %1$s weeks by %2$s."))]
     MsgEphemeralTimerWeeksBy = 157,
 
-    #[strum(props(fallback = "You enabled chat protection."))]
-    YouEnabledProtection = 158,
-
-    #[strum(props(fallback = "Chat protection enabled by %1$s."))]
-    ProtectionEnabledBy = 159,
-
-    #[strum(props(fallback = "You disabled chat protection."))]
-    YouDisabledProtection = 160,
-
-    #[strum(props(fallback = "Chat protection disabled by %1$s."))]
-    ProtectionDisabledBy = 161,
-
     #[strum(props(fallback = "Scan to set up second device for %1$s"))]
     BackupTransferQr = 162,
 
     #[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,
+
+    #[strum(props(fallback = "Messages are guaranteed to be end-to-end encrypted from now on."))]
+    ChatProtectionEnabled = 170,
+
+    #[strum(props(fallback = "%1$s sent a message from another device."))]
+    ChatProtectionDisabled = 171,
 }
 
 impl StockMessage {
@@ -506,13 +509,21 @@ trait StockStringMods: AsRef<str> + Sized {
 }
 
 impl ContactId {
-    /// Get contact name for stock string.
-    async fn get_stock_name(self, context: &Context) -> String {
+    /// Get contact name and address for stock string, e.g. `Bob (bob@example.net)`
+    async fn get_stock_name_n_addr(self, context: &Context) -> String {
         Contact::get_by_id(context, self)
             .await
             .map(|contact| contact.get_name_n_addr())
             .unwrap_or_else(|_| self.to_string())
     }
+
+    /// Get contact name, e.g. `Bob`, or `bob@exmple.net` if no name is set.
+    async fn get_stock_name(self, context: &Context) -> String {
+        Contact::get_by_id(context, self)
+            .await
+            .map(|contact| contact.get_display_name().to_string())
+            .unwrap_or_else(|_| self.to_string())
+    }
 }
 
 impl StockStringMods for String {}
@@ -574,7 +585,7 @@ pub(crate) async fn msg_grp_name(
             .await
             .replace1(from_group)
             .replace2(to_group)
-            .replace3(&by_contact.get_stock_name(context).await)
+            .replace3(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -584,21 +595,39 @@ pub(crate) async fn msg_grp_img_changed(context: &Context, by_contact: ContactId
     } else {
         translated(context, StockMessage::MsgGrpImgChangedBy)
             .await
-            .replace1(&by_contact.get_stock_name(context).await)
+            .replace1(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
-/// Stock string: `Member %1$s added.`.
+/// 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.`.
 ///
 /// 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(
+pub(crate) async fn msg_add_member_local(
     context: &Context,
     added_member_addr: &str,
     by_contact: ContactId,
 ) -> String {
     let addr = added_member_addr;
-    let who = &match Contact::lookup_id_by_addr(context, addr, Origin::Unknown).await {
+    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_name_n_addr())
@@ -608,26 +637,44 @@ pub(crate) async fn msg_add_member(
     if by_contact == ContactId::SELF {
         translated(context, StockMessage::MsgYouAddMember)
             .await
-            .replace1(who)
+            .replace1(whom)
     } else {
         translated(context, StockMessage::MsgAddMemberBy)
             .await
-            .replace1(who)
-            .replace2(&by_contact.get_stock_name(context).await)
+            .replace1(whom)
+            .replace2(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
-/// Stock string: `Member %1$s removed.`.
+/// Stock string: `I removed member %1$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(
+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(
     context: &Context,
     removed_member_addr: &str,
     by_contact: ContactId,
 ) -> String {
     let addr = removed_member_addr;
-    let who = &match Contact::lookup_id_by_addr(context, addr, Origin::Unknown).await {
+    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_name_n_addr())
@@ -637,23 +684,28 @@ pub(crate) async fn msg_del_member(
     if by_contact == ContactId::SELF {
         translated(context, StockMessage::MsgYouDelMember)
             .await
-            .replace1(who)
+            .replace1(whom)
     } else {
         translated(context, StockMessage::MsgDelMemberBy)
             .await
-            .replace1(who)
-            .replace2(&by_contact.get_stock_name(context).await)
+            .replace1(whom)
+            .replace2(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
-/// Stock string: `Group left.`.
-pub(crate) async fn msg_group_left(context: &Context, by_contact: ContactId) -> String {
+/// 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 {
     if by_contact == ContactId::SELF {
         translated(context, StockMessage::MsgYouLeftGroup).await
     } else {
         translated(context, StockMessage::MsgGroupLeftBy)
             .await
-            .replace1(&by_contact.get_stock_name(context).await)
+            .replace1(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -706,7 +758,7 @@ pub(crate) async fn msg_grp_img_deleted(context: &Context, by_contact: ContactId
     } else {
         translated(context, StockMessage::MsgGrpImgDeletedBy)
             .await
-            .replace1(&by_contact.get_stock_name(context).await)
+            .replace1(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -732,13 +784,9 @@ pub(crate) async fn secure_join_started(
 
 /// Stock string: `%1$s replied, waiting for being added to the group…`.
 pub(crate) async fn secure_join_replies(context: &Context, contact_id: ContactId) -> String {
-    if let Ok(contact) = Contact::get_by_id(context, contact_id).await {
-        translated(context, StockMessage::SecureJoinReplies)
-            .await
-            .replace1(contact.get_display_name())
-    } else {
-        format!("secure_join_replies: unknown contact {contact_id}")
-    }
+    translated(context, StockMessage::SecureJoinReplies)
+        .await
+        .replace1(&contact_id.get_stock_name(context).await)
 }
 
 /// Stock string: `Scan to chat with %1$s`.
@@ -831,7 +879,7 @@ pub(crate) async fn msg_location_enabled_by(context: &Context, contact: ContactI
     } else {
         translated(context, StockMessage::MsgLocationEnabledBy)
             .await
-            .replace1(&contact.get_stock_name(context).await)
+            .replace1(&contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -900,7 +948,7 @@ pub(crate) async fn msg_ephemeral_timer_disabled(
     } else {
         translated(context, StockMessage::MsgEphemeralTimerDisabledBy)
             .await
-            .replace1(&by_contact.get_stock_name(context).await)
+            .replace1(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -918,7 +966,7 @@ pub(crate) async fn msg_ephemeral_timer_enabled(
         translated(context, StockMessage::MsgEphemeralTimerEnabledBy)
             .await
             .replace1(timer)
-            .replace2(&by_contact.get_stock_name(context).await)
+            .replace2(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -929,7 +977,7 @@ pub(crate) async fn msg_ephemeral_timer_minute(context: &Context, by_contact: Co
     } else {
         translated(context, StockMessage::MsgEphemeralTimerMinuteBy)
             .await
-            .replace1(&by_contact.get_stock_name(context).await)
+            .replace1(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -940,7 +988,7 @@ pub(crate) async fn msg_ephemeral_timer_hour(context: &Context, by_contact: Cont
     } else {
         translated(context, StockMessage::MsgEphemeralTimerHourBy)
             .await
-            .replace1(&by_contact.get_stock_name(context).await)
+            .replace1(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -951,7 +999,7 @@ pub(crate) async fn msg_ephemeral_timer_day(context: &Context, by_contact: Conta
     } else {
         translated(context, StockMessage::MsgEphemeralTimerDayBy)
             .await
-            .replace1(&by_contact.get_stock_name(context).await)
+            .replace1(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -962,7 +1010,7 @@ pub(crate) async fn msg_ephemeral_timer_week(context: &Context, by_contact: Cont
     } else {
         translated(context, StockMessage::MsgEphemeralTimerWeekBy)
             .await
-            .replace1(&by_contact.get_stock_name(context).await)
+            .replace1(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -1003,26 +1051,16 @@ pub(crate) async fn error_no_network(context: &Context) -> String {
     translated(context, StockMessage::ErrorNoNetwork).await
 }
 
-/// Stock string: `Chat protection enabled.`.
-pub(crate) async fn protection_enabled(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::YouEnabledProtection).await
-    } else {
-        translated(context, StockMessage::ProtectionEnabledBy)
-            .await
-            .replace1(&by_contact.get_stock_name(context).await)
-    }
+/// Stock string: `Messages are guaranteed to be end-to-end encrypted from now on.`
+pub(crate) async fn chat_protection_enabled(context: &Context) -> String {
+    translated(context, StockMessage::ChatProtectionEnabled).await
 }
 
-/// Stock string: `Chat protection disabled.`.
-pub(crate) async fn protection_disabled(context: &Context, by_contact: ContactId) -> String {
-    if by_contact == ContactId::SELF {
-        translated(context, StockMessage::YouDisabledProtection).await
-    } else {
-        translated(context, StockMessage::ProtectionDisabledBy)
-            .await
-            .replace1(&by_contact.get_stock_name(context).await)
-    }
+/// Stock string: `%1$s sent a message from another device.`
+pub(crate) async fn chat_protection_disabled(context: &Context, contact_id: ContactId) -> String {
+    translated(context, StockMessage::ChatProtectionDisabled)
+        .await
+        .replace1(&contact_id.get_stock_name(context).await)
 }
 
 /// Stock string: `Reply`.
@@ -1054,7 +1092,7 @@ pub(crate) async fn msg_ephemeral_timer_minutes(
         translated(context, StockMessage::MsgEphemeralTimerMinutesBy)
             .await
             .replace1(minutes)
-            .replace2(&by_contact.get_stock_name(context).await)
+            .replace2(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -1072,7 +1110,7 @@ pub(crate) async fn msg_ephemeral_timer_hours(
         translated(context, StockMessage::MsgEphemeralTimerHoursBy)
             .await
             .replace1(hours)
-            .replace2(&by_contact.get_stock_name(context).await)
+            .replace2(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -1090,7 +1128,7 @@ pub(crate) async fn msg_ephemeral_timer_days(
         translated(context, StockMessage::MsgEphemeralTimerDaysBy)
             .await
             .replace1(days)
-            .replace2(&by_contact.get_stock_name(context).await)
+            .replace2(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -1108,7 +1146,7 @@ pub(crate) async fn msg_ephemeral_timer_weeks(
         translated(context, StockMessage::MsgEphemeralTimerWeeksBy)
             .await
             .replace1(weeks)
-            .replace2(&by_contact.get_stock_name(context).await)
+            .replace2(&by_contact.get_stock_name_n_addr(context).await)
     }
 }
 
@@ -1282,11 +1320,19 @@ impl Context {
     pub(crate) async fn stock_protection_msg(
         &self,
         protect: ProtectionStatus,
-        from_id: ContactId,
+        contact_id: Option<ContactId>,
     ) -> String {
         match protect {
-            ProtectionStatus::Unprotected => protection_enabled(self, from_id).await,
-            ProtectionStatus::Protected => protection_disabled(self, from_id).await,
+            ProtectionStatus::Unprotected | ProtectionStatus::ProtectionBroken => {
+                if let Some(contact_id) = contact_id {
+                    chat_protection_disabled(self, contact_id).await
+                } else {
+                    // In a group chat, it's not possible to downgrade verification.
+                    // In a 1:1 chat, the `contact_id` always has to be provided.
+                    "[Error] No contact_id given".to_string()
+                }
+            }
+            ProtectionStatus::Protected => chat_protection_enabled(self).await,
         }
     }
 
@@ -1313,7 +1359,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 = Some(welcome_message(self).await);
+        msg.text = welcome_message(self).await;
         chat::add_device_msg(self, Some("core-welcome"), Some(&mut msg)).await?;
         Ok(())
     }
@@ -1387,7 +1433,7 @@ mod tests {
         let contact_id = Contact::create(&t.ctx, "Someone", "someone@example.org")
             .await
             .unwrap();
-        let contact = Contact::load_from_db(&t.ctx, contact_id).await.unwrap();
+        let contact = Contact::get_by_id(&t.ctx, contact_id).await.unwrap();
         // uses %1$s substitution
         assert_eq!(
             contact_verified(&t, &contact).await,
@@ -1409,7 +1455,11 @@ mod tests {
     async fn test_stock_system_msg_add_member_by_me() {
         let t = TestContext::new().await;
         assert_eq!(
-            msg_add_member(&t, "alice@example.org", ContactId::SELF).await,
+            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,
             "You added member alice@example.org."
         )
     }
@@ -1421,7 +1471,11 @@ mod tests {
             .await
             .expect("failed to create contact");
         assert_eq!(
-            msg_add_member(&t, "alice@example.org", ContactId::SELF).await,
+            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,
             "You added member Alice (alice@example.org)."
         );
     }
@@ -1438,7 +1492,7 @@ mod tests {
                 .expect("failed to create bob")
         };
         assert_eq!(
-            msg_add_member(&t, "alice@example.org", contact_id,).await,
+            msg_add_member_local(&t, "alice@example.org", contact_id,).await,
             "Member Alice (alice@example.org) added by Bob (bob@example.com)."
         );
     }

src/summary.rs

@@ -175,16 +175,12 @@ impl Message {
             return prefix;
         }
 
-        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 {
+        let summary_content = if self.text.is_empty() {
             prefix
+        } else if prefix.is_empty() {
+            self.text.to_string()
+        } else {
+            format!("{prefix} – {}", self.text)
         };
 
         let summary = if self.is_forwarded() {
@@ -211,19 +207,16 @@ mod tests {
         let d = test::TestContext::new().await;
         let ctx = &d.ctx;
 
-        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 some_text = " bla \t\n\tbla\n\t".to_string();
 
         let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(some_text.clone());
+        msg.set_text(some_text.to_string());
         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,
@@ -231,7 +224,6 @@ 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,
@@ -239,7 +231,6 @@ 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,
@@ -247,7 +238,6 @@ 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,
@@ -255,7 +245,6 @@ 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,
@@ -263,7 +252,6 @@ 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,
@@ -279,7 +267,6 @@ 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,
@@ -287,7 +274,6 @@ 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,
@@ -329,7 +315,6 @@ 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!(

src/sync.rs

@@ -130,7 +130,7 @@ impl Context {
             let mut msg = Message {
                 chat_id,
                 viewtype: Viewtype::Text,
-                text: Some(stock_str::sync_msg_body(self).await),
+                text: stock_str::sync_msg_body(self).await,
                 hidden: true,
                 subject: stock_str::sync_msg_subject(self).await,
                 ..Default::default()

src/test_utils.rs

@@ -31,11 +31,14 @@ use crate::constants::Chattype;
 use crate::constants::{DC_GCL_NO_SPECIALS, DC_MSG_ID_DAYMARKER};
 use crate::contact::{Contact, ContactAddress, ContactId, Modifier, Origin};
 use crate::context::Context;
+use crate::e2ee::EncryptHelper;
 use crate::events::{Event, EventType, Events};
 use crate::key::{self, DcKey, KeyPair, KeyPairUse};
 use crate::message::{update_msg_state, Message, MessageState, MsgId, Viewtype};
-use crate::mimeparser::MimeMessage;
+use crate::mimeparser::{MimeMessage, SystemMessage};
+use crate::peerstate::Peerstate;
 use crate::receive_imf::receive_imf;
+use crate::securejoin::{get_securejoin_qr, join_securejoin};
 use crate::stock_str::StockStrings;
 use crate::tools::EmailAddress;
 
@@ -108,9 +111,15 @@ impl TestContextManager {
     /// - Let one TestContext send a message
     /// - Let the other TestContext receive it and accept the chat
     /// - Assert that the message arrived
-    pub async fn send_recv_accept(&self, from: &TestContext, to: &TestContext, msg: &str) {
+    pub async fn send_recv_accept(
+        &self,
+        from: &TestContext,
+        to: &TestContext,
+        msg: &str,
+    ) -> Message {
         let received_msg = self.send_recv(from, to, msg).await;
         received_msg.chat_id.accept(to).await.unwrap();
+        received_msg
     }
 
     /// - Let one TestContext send a message
@@ -118,7 +127,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.as_ref().unwrap(), msg);
+        assert_eq!(received_msg.text, msg);
         received_msg
     }
 
@@ -152,6 +161,27 @@ impl TestContextManager {
             new_addr
         );
     }
+
+    pub async fn execute_securejoin(&self, scanner: &TestContext, scanned: &TestContext) {
+        self.section(&format!(
+            "{} scans {}'s QR code",
+            scanner.name(),
+            scanned.name()
+        ));
+
+        let qr = get_securejoin_qr(&scanned.ctx, None).await.unwrap();
+        join_securejoin(&scanner.ctx, &qr).await.unwrap();
+
+        loop {
+            if let Some(sent) = scanner.pop_sent_msg_opt(Duration::ZERO).await {
+                scanned.recv_msg(&sent).await;
+            } else if let Some(sent) = scanned.pop_sent_msg_opt(Duration::ZERO).await {
+                scanner.recv_msg(&sent).await;
+            } else {
+                break;
+            }
+        }
+    }
 }
 
 #[derive(Debug, Clone, Default)]
@@ -553,7 +583,7 @@ impl TestContext {
             Modifier::Modified => warn!(&self.ctx, "Contact {} modified by TestContext", &addr),
             Modifier::Created => warn!(&self.ctx, "Contact {} created by TestContext", &addr),
         }
-        Contact::load_from_db(&self.ctx, contact_id).await.unwrap()
+        Contact::get_by_id(&self.ctx, contact_id).await.unwrap()
     }
 
     /// Returns 1:1 [`Chat`] with another account, if it exists.
@@ -608,7 +638,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.set_text(Some(txt.to_string()));
+        msg.text = txt.to_string();
         self.send_msg(chat_id, &mut msg).await
     }
 
@@ -636,7 +666,7 @@ impl TestContext {
         // We're using `unwrap_or_default()` here so that if the file doesn't exist,
         // it can be created using `write` below.
         let expected = fs::read(&filename).await.unwrap_or_default();
-        let expected = String::from_utf8(expected).unwrap();
+        let expected = String::from_utf8(expected).unwrap().replace("\r\n", "\n");
         if (std::env::var("UPDATE_GOLDEN_TESTS") == Ok("1".to_string())) && actual != expected {
             fs::write(&filename, &actual)
                 .await
@@ -1008,6 +1038,26 @@ fn print_logevent(logevent: &LogEvent) {
     }
 }
 
+/// Saves the other account's public key as verified.
+pub(crate) async fn mark_as_verified(this: &TestContext, other: &TestContext) {
+    let mut peerstate = Peerstate::from_header(
+        &EncryptHelper::new(other).await.unwrap().get_aheader(),
+        // We have to give 0 as the time, not the current time:
+        // The time is going to be saved in peerstate.last_seen.
+        // The code in `peerstate.rs` then compares `if message_time > self.last_seen`,
+        // and many similar checks in peerstate.rs, and doesn't allow changes otherwise.
+        // Giving the current time would mean that message_time == peerstate.last_seen,
+        // so changes would not be allowed.
+        // This might lead to flaky tests.
+        0,
+    );
+
+    peerstate.verified_key = peerstate.public_key.clone();
+    peerstate.verified_key_fingerprint = peerstate.public_key_fingerprint.clone();
+
+    peerstate.save_to_db(&this.sql).await.unwrap();
+}
+
 /// Pretty-print an event to stdout
 ///
 /// Done during tests this is captured by `cargo test` and associated with the test itself.
@@ -1104,7 +1154,7 @@ async fn write_msg(context: &Context, prefix: &str, msg: &Message, buf: &mut Str
         if msg.has_location() { "📍" } else { "" },
         &contact_name,
         contact_id,
-        msgtext.unwrap_or_default(),
+        msgtext,
         if msg.get_from_id() == ContactId::SELF {
             ""
         } else if msg.get_state() == MessageState::InSeen {
@@ -1114,7 +1164,17 @@ async fn write_msg(context: &Context, prefix: &str, msg: &Message, buf: &mut Str
         } else {
             "[FRESH]"
         },
-        if msg.is_info() { "[INFO]" } else { "" },
+        if msg.is_info() {
+            if msg.get_info_type() == SystemMessage::ChatProtectionEnabled {
+                "[INFO 🛡️]"
+            } else if msg.get_info_type() == SystemMessage::ChatProtectionDisabled {
+                "[INFO 🛡️❌]"
+            } else {
+                "[INFO]"
+            }
+        } else {
+            ""
+        },
         if msg.get_viewtype() == Viewtype::VideochatInvitation {
             format!(
                 "[VIDEOCHAT-INVITATION: {}, type={}]",

src/tests.rs

@@ -1 +1,2 @@
 mod aeap;
+mod verified_chats;

src/tests/aeap.rs

@@ -8,10 +8,10 @@ use crate::contact;
 use crate::contact::Contact;
 use crate::contact::ContactId;
 use crate::message::Message;
-use crate::peerstate;
 use crate::peerstate::Peerstate;
 use crate::receive_imf::receive_imf;
 use crate::stock_str;
+use crate::test_utils::mark_as_verified;
 use crate::test_utils::TestContext;
 use crate::test_utils::TestContextManager;
 
@@ -32,7 +32,7 @@ async fn test_change_primary_self_addr() -> Result<()> {
     // Alice set up message forwarding so that she still receives
     // the message with her new address
     let alice_msg = alice.recv_msg(&sent).await;
-    assert_eq!(alice_msg.text, Some("hi back".to_string()));
+    assert_eq!(alice_msg.text, "hi back".to_string());
     assert_eq!(alice_msg.get_showpadlock(), true);
     let alice_bob_chat = alice.create_chat(&bob).await;
     assert_eq!(alice_msg.chat_id, alice_bob_chat.id);
@@ -57,10 +57,7 @@ Message w/out In-Reply-To
 
     let alice_msg = alice.get_last_msg().await;
 
-    assert_eq!(
-        alice_msg.text,
-        Some("Message w/out In-Reply-To".to_string())
-    );
+    assert_eq!(alice_msg.text, "Message w/out In-Reply-To");
     assert_eq!(alice_msg.get_showpadlock(), false);
     assert_eq!(alice_msg.chat_id, alice_bob_chat.id);
 
@@ -216,7 +213,7 @@ async fn check_aeap_transition(
         .await;
     let recvd = bob.recv_msg(&sent).await;
     let sent_timestamp = recvd.timestamp_sent;
-    assert_eq!(recvd.text.unwrap(), "Hello from my new addr!");
+    assert_eq!(recvd.text, "Hello from my new addr!");
 
     tcm.section("Check that the AEAP transition worked");
     check_that_transition_worked(
@@ -245,7 +242,7 @@ async fn check_aeap_transition(
         .send_text(chat_to_send, "Hello from my old addr!")
         .await;
     let recvd = bob.recv_msg(&sent).await;
-    assert_eq!(recvd.text.unwrap(), "Hello from my old addr!");
+    assert_eq!(recvd.text, "Hello from my old addr!");
 
     check_that_transition_worked(
         &groups[2..],
@@ -291,13 +288,13 @@ async fn check_that_transition_worked(
         let info_msg = get_last_info_msg(bob, *group).await.unwrap();
         let expected_text =
             stock_str::aeap_addr_changed(bob, name, old_alice_addr, new_alice_addr).await;
-        assert_eq!(info_msg.text.unwrap(), expected_text);
+        assert_eq!(info_msg.text, expected_text);
         assert_eq!(info_msg.from_id, ContactId::INFO);
 
         let msg = format!("Sending to group {group}");
         let sent = bob.send_text(*group, &msg).await;
         let recvd = alice.recv_msg(&sent).await;
-        assert_eq!(recvd.text.unwrap(), msg);
+        assert_eq!(recvd.text, msg);
     }
 }
 
@@ -330,19 +327,6 @@ async fn check_no_transition_done(groups: &[ChatId], old_alice_addr: &str, bob:
     }
 }
 
-async fn mark_as_verified(this: &TestContext, other: &TestContext) {
-    let other_addr = other.get_primary_self_addr().await.unwrap();
-    let mut peerstate = peerstate::Peerstate::from_addr(this, &other_addr)
-        .await
-        .unwrap()
-        .unwrap();
-
-    peerstate.verified_key = peerstate.public_key.clone();
-    peerstate.verified_key_fingerprint = peerstate.public_key_fingerprint.clone();
-
-    peerstate.save_to_db(&this.sql).await.unwrap();
-}
-
 async fn get_last_info_msg(t: &TestContext, chat_id: ChatId) -> Option<Message> {
     let msgs = chat::get_chat_msgs_ex(
         &t.ctx,

src/tests/verified_chats.rs

@@ -0,0 +1,547 @@
+use anyhow::Result;
+use pretty_assertions::assert_eq;
+
+use crate::chat::{Chat, ProtectionStatus};
+use crate::config::Config;
+use crate::contact::VerifiedStatus;
+use crate::contact::{Contact, Origin};
+use crate::message::{Message, Viewtype};
+use crate::mimefactory::MimeFactory;
+use crate::mimeparser::SystemMessage;
+use crate::receive_imf::receive_imf;
+use crate::stock_str;
+use crate::test_utils::{get_chat_msg, mark_as_verified, TestContext, TestContextManager};
+use crate::{e2ee, message};
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_verified_oneonone_chat_broken_by_classical() {
+    check_verified_oneonone_chat(true).await;
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_verified_oneonone_chat_broken_by_device_change() {
+    check_verified_oneonone_chat(false).await;
+}
+
+async fn check_verified_oneonone_chat(broken_by_classical_email: bool) {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    enable_verified_oneonone_chats(&[&alice, &bob]).await;
+
+    tcm.execute_securejoin(&alice, &bob).await;
+
+    assert_verified(&alice, &bob, ProtectionStatus::Protected).await;
+    assert_verified(&bob, &alice, ProtectionStatus::Protected).await;
+
+    if broken_by_classical_email {
+        tcm.section("Bob uses a classical MUA to send a message to Alice");
+        receive_imf(
+            &alice,
+            b"Subject: Re: Message from alice\r\n\
+          From: <bob@example.net>\r\n\
+          To: <alice@example.org>\r\n\
+          Date: Mon, 12 Dec 2022 14:33:39 +0000\r\n\
+          Message-ID: <abcd@example.net>\r\n\
+          \r\n\
+          Heyho!\r\n",
+            false,
+        )
+        .await
+        .unwrap()
+        .unwrap();
+    } else {
+        tcm.section("Bob sets up another Delta Chat device");
+        let bob2 = TestContext::new().await;
+        enable_verified_oneonone_chats(&[&bob2]).await;
+        bob2.set_name("bob2");
+        bob2.configure_addr("bob@example.net").await;
+
+        tcm.send_recv(&bob2, &alice, "Using another device now")
+            .await;
+    }
+
+    // Bob's contact is still verified, but the chat isn't marked as protected anymore
+    assert_verified(&alice, &bob, ProtectionStatus::ProtectionBroken).await;
+
+    tcm.section("Bob sends another message from DC");
+    tcm.send_recv(&bob, &alice, "Using DC again").await;
+
+    let contact = alice.add_or_lookup_contact(&bob).await;
+    assert_eq!(
+        contact.is_verified(&alice.ctx).await.unwrap(),
+        VerifiedStatus::BidirectVerified
+    );
+
+    // Bob's chat is marked as verified again
+    assert_verified(&alice, &bob, ProtectionStatus::Protected).await;
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_create_verified_oneonone_chat() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    let fiona = tcm.fiona().await;
+    enable_verified_oneonone_chats(&[&alice, &bob, &fiona]).await;
+
+    tcm.execute_securejoin(&alice, &bob).await;
+    tcm.execute_securejoin(&bob, &fiona).await;
+    assert_verified(&alice, &bob, ProtectionStatus::Protected).await;
+    assert_verified(&bob, &alice, ProtectionStatus::Protected).await;
+    assert_verified(&bob, &fiona, ProtectionStatus::Protected).await;
+    assert_verified(&fiona, &bob, ProtectionStatus::Protected).await;
+
+    let group_id = bob
+        .create_group_with_members(
+            ProtectionStatus::Protected,
+            "Group with everyone",
+            &[&alice, &fiona],
+        )
+        .await;
+    assert_eq!(
+        get_chat_msg(&bob, group_id, 0, 1).await.get_info_type(),
+        SystemMessage::ChatProtectionEnabled
+    );
+
+    {
+        let sent = bob.send_text(group_id, "Heyho").await;
+        alice.recv_msg(&sent).await;
+
+        let msg = fiona.recv_msg(&sent).await;
+        assert_eq!(
+            get_chat_msg(&fiona, msg.chat_id, 0, 2)
+                .await
+                .get_info_type(),
+            SystemMessage::ChatProtectionEnabled
+        );
+    }
+
+    // Alice and Fiona should now be verified because of gossip
+    let alice_fiona_contact = alice.add_or_lookup_contact(&fiona).await;
+    assert_eq!(
+        alice_fiona_contact.is_verified(&alice).await.unwrap(),
+        VerifiedStatus::BidirectVerified
+    );
+
+    // As soon as Alice creates a chat with Fiona, it should directly be protected
+    {
+        let chat = alice.create_chat(&fiona).await;
+        assert!(chat.is_protected());
+
+        let msg = alice.get_last_msg().await;
+        let expected_text = stock_str::chat_protection_enabled(&alice).await;
+        assert_eq!(msg.text, expected_text);
+    }
+
+    // Fiona should also see the chat as protected
+    {
+        let rcvd = tcm.send_recv(&alice, &fiona, "Hi Fiona").await;
+        let alice_fiona_id = rcvd.chat_id;
+        let chat = Chat::load_from_db(&fiona, alice_fiona_id).await?;
+        assert!(chat.is_protected());
+
+        let msg0 = get_chat_msg(&fiona, chat.id, 0, 2).await;
+        let expected_text = stock_str::chat_protection_enabled(&fiona).await;
+        assert_eq!(msg0.text, expected_text);
+    }
+
+    tcm.section("Fiona reinstalls DC");
+    drop(fiona);
+
+    let fiona_new = tcm.unconfigured().await;
+    enable_verified_oneonone_chats(&[&fiona_new]).await;
+    fiona_new.configure_addr("fiona@example.net").await;
+    e2ee::ensure_secret_key_exists(&fiona_new).await?;
+
+    tcm.send_recv(&fiona_new, &alice, "I have a new device")
+        .await;
+
+    // The chat should be and stay unprotected
+    {
+        let chat = alice.get_chat(&fiona_new).await.unwrap();
+        assert!(!chat.is_protected());
+        assert!(chat.is_protection_broken());
+
+        // After recreating the chat, it should still be unprotected
+        chat.id.delete(&alice).await?;
+
+        let chat = alice.create_chat(&fiona_new).await;
+        assert!(!chat.is_protected());
+        assert!(!chat.is_protection_broken());
+    }
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_create_unverified_oneonone_chat() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    enable_verified_oneonone_chats(&[&alice, &bob]).await;
+
+    // A chat with an unknown contact should be created unprotected
+    let chat = alice.create_chat(&bob).await;
+    assert!(!chat.is_protected());
+    assert!(!chat.is_protection_broken());
+
+    receive_imf(
+        &alice,
+        b"From: Bob <bob@example.net>\n\
+          To: alice@example.org\n\
+          Message-ID: <1234-2@example.org>\n\
+          \n\
+          hello\n",
+        false,
+    )
+    .await?;
+
+    chat.id.delete(&alice).await.unwrap();
+    // Now Bob is a known contact, new chats should still be created unprotected
+    let chat = alice.create_chat(&bob).await;
+    assert!(!chat.is_protected());
+    assert!(!chat.is_protection_broken());
+
+    tcm.send_recv(&bob, &alice, "hi").await;
+    chat.id.delete(&alice).await.unwrap();
+    // Now we have a public key, new chats should still be created unprotected
+    let chat = alice.create_chat(&bob).await;
+    assert!(!chat.is_protected());
+    assert!(!chat.is_protection_broken());
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_degrade_verified_oneonone_chat() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    enable_verified_oneonone_chats(&[&alice, &bob]).await;
+
+    mark_as_verified(&alice, &bob).await;
+
+    let alice_chat = alice.create_chat(&bob).await;
+    assert!(alice_chat.is_protected());
+
+    receive_imf(
+        &alice,
+        b"From: Bob <bob@example.net>\n\
+          To: alice@example.org\n\
+          Message-ID: <1234-2@example.org>\n\
+          \n\
+          hello\n",
+        false,
+    )
+    .await?;
+
+    let contact_id = Contact::lookup_id_by_addr(&alice, "bob@example.net", Origin::Hidden)
+        .await?
+        .unwrap();
+
+    let msg0 = get_chat_msg(&alice, alice_chat.id, 0, 3).await;
+    let enabled = stock_str::chat_protection_enabled(&alice).await;
+    assert_eq!(msg0.text, enabled);
+    assert_eq!(msg0.param.get_cmd(), SystemMessage::ChatProtectionEnabled);
+
+    let msg1 = get_chat_msg(&alice, alice_chat.id, 1, 3).await;
+    let disabled = stock_str::chat_protection_disabled(&alice, contact_id).await;
+    assert_eq!(msg1.text, disabled);
+    assert_eq!(msg1.param.get_cmd(), SystemMessage::ChatProtectionDisabled);
+
+    let msg2 = get_chat_msg(&alice, alice_chat.id, 2, 3).await;
+    assert_eq!(msg2.text, "hello".to_string());
+    assert!(!msg2.is_system_message());
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_verified_oneonone_chat_enable_disable() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    enable_verified_oneonone_chats(&[&alice, &bob]).await;
+
+    // Alice & Bob verify each other
+    mark_as_verified(&alice, &bob).await;
+    mark_as_verified(&bob, &alice).await;
+
+    let chat = alice.create_chat(&bob).await;
+    assert!(chat.is_protected());
+
+    for alice_accepts_breakage in [true, false] {
+        // Bob uses Thunderbird to send a message
+        receive_imf(
+            &alice,
+            format!(
+                "From: Bob <bob@example.net>\n\
+              To: alice@example.org\n\
+              Message-ID: <1234-2{alice_accepts_breakage}@example.org>\n\
+              \n\
+              Message from Thunderbird\n"
+            )
+            .as_bytes(),
+            false,
+        )
+        .await?;
+
+        let chat = alice.get_chat(&bob).await.unwrap();
+        assert!(!chat.is_protected());
+        assert!(chat.is_protection_broken());
+
+        if alice_accepts_breakage {
+            tcm.section("Alice clicks 'Accept' on the input-bar-dialog");
+            chat.id.accept(&alice).await?;
+            let chat = alice.get_chat(&bob).await.unwrap();
+            assert!(!chat.is_protected());
+            assert!(!chat.is_protection_broken());
+        }
+
+        // Bob sends a message from DC again
+        tcm.send_recv(&bob, &alice, "Hello from DC").await;
+        let chat = alice.get_chat(&bob).await.unwrap();
+        assert!(chat.is_protected());
+        assert!(!chat.is_protection_broken());
+    }
+
+    alice
+        .golden_test_chat(chat.id, "test_verified_oneonone_chat_enable_disable")
+        .await;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_mdn_doesnt_disable_verification() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    enable_verified_oneonone_chats(&[&alice, &bob]).await;
+    bob.set_config_bool(Config::MdnsEnabled, true).await?;
+
+    // Alice & Bob verify each other
+    mark_as_verified(&alice, &bob).await;
+    mark_as_verified(&bob, &alice).await;
+
+    let rcvd = tcm.send_recv_accept(&alice, &bob, "Heyho").await;
+    message::markseen_msgs(&bob, vec![rcvd.id]).await?;
+
+    let mimefactory = MimeFactory::from_mdn(&bob, &rcvd, vec![]).await?;
+    let rendered_msg = mimefactory.render(&bob).await?;
+    let body = rendered_msg.message;
+    receive_imf(&alice, body.as_bytes(), false).await.unwrap();
+
+    assert_verified(&alice, &bob, ProtectionStatus::Protected).await;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_outgoing_mua_msg() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    enable_verified_oneonone_chats(&[&alice, &bob]).await;
+
+    mark_as_verified(&alice, &bob).await;
+    mark_as_verified(&bob, &alice).await;
+
+    tcm.send_recv_accept(&bob, &alice, "Heyho from DC").await;
+    assert_verified(&alice, &bob, ProtectionStatus::Protected).await;
+
+    let sent = receive_imf(
+        &alice,
+        b"From: alice@example.org\n\
+          To: bob@example.net\n\
+          \n\
+          One classical MUA message",
+        false,
+    )
+    .await?
+    .unwrap();
+    tcm.send_recv_accept(&alice, &bob, "Sending with DC again")
+        .await;
+
+    alice
+        .golden_test_chat(sent.chat_id, "test_outgoing_mua_msg")
+        .await;
+
+    Ok(())
+}
+
+/// If Bob answers unencrypted from another address with a classical MUA,
+/// the message is under some circumstances still assigned to the original
+/// chat (see lookup_chat_by_reply()); this is meant to make aliases
+/// work nicely.
+/// However, if the original chat is verified, the unencrypted message
+/// must NOT be assigned to it (it would be replaced by an error
+/// message in the verified chat, so, this would just be a usability issue,
+/// not a security issue).
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_reply() -> Result<()> {
+    for verified in [false, true] {
+        let mut tcm = TestContextManager::new();
+        let alice = tcm.alice().await;
+        let bob = tcm.bob().await;
+        enable_verified_oneonone_chats(&[&alice, &bob]).await;
+
+        if verified {
+            mark_as_verified(&alice, &bob).await;
+            mark_as_verified(&bob, &alice).await;
+        }
+
+        tcm.send_recv_accept(&bob, &alice, "Heyho from DC").await;
+        let encrypted_msg = tcm.send_recv_accept(&alice, &bob, "Heyho back").await;
+
+        let unencrypted_msg = receive_imf(
+            &alice,
+            format!(
+                "From: bob@someotherdomain.org\n\
+                 To: some-alias-forwarding-to-alice@example.org\n\
+                 In-Reply-To: {}\n\
+                 \n\
+                 Weird reply",
+                encrypted_msg.rfc724_mid
+            )
+            .as_bytes(),
+            false,
+        )
+        .await?
+        .unwrap();
+
+        let unencrypted_msg = Message::load_from_db(&alice, unencrypted_msg.msg_ids[0]).await?;
+        assert_eq!(unencrypted_msg.text, "Weird reply");
+
+        if verified {
+            assert_ne!(unencrypted_msg.chat_id, encrypted_msg.chat_id);
+        } else {
+            assert_eq!(unencrypted_msg.chat_id, encrypted_msg.chat_id);
+        }
+    }
+
+    Ok(())
+}
+
+/// Regression test for the following bug:
+///
+/// - Scan your chat partner's QR Code
+/// - They change devices
+/// - They send you a message
+/// - Without accepting the encryption downgrade, scan your chat partner's QR Code again
+///
+/// -> The re-verification fails.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_break_protection_then_verify_again() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    enable_verified_oneonone_chats(&[&alice, &bob]).await;
+
+    // Cave: Bob can't write a message to Alice here.
+    // If he did, alice would increase his peerstate's last_seen timestamp.
+    // Then, after Bob reinstalls DC, alice's `if message_time > last_seen*`
+    // checks would return false (there are many checks of this form in peerstate.rs).
+    // Therefore, during the securejoin, Alice wouldn't accept the new key
+    // and reject the securejoin.
+
+    mark_as_verified(&alice, &bob).await;
+    mark_as_verified(&bob, &alice).await;
+
+    alice.create_chat(&bob).await;
+    assert_verified(&alice, &bob, ProtectionStatus::Protected).await;
+
+    tcm.section("Bob reinstalls DC");
+    drop(bob);
+    let bob_new = tcm.unconfigured().await;
+    enable_verified_oneonone_chats(&[&bob_new]).await;
+    bob_new.configure_addr("bob@example.net").await;
+    e2ee::ensure_secret_key_exists(&bob_new).await?;
+
+    tcm.send_recv(&bob_new, &alice, "I have a new device").await;
+    assert_verified(&alice, &bob_new, ProtectionStatus::ProtectionBroken).await;
+
+    {
+        let alice_bob_chat = alice.get_chat(&bob_new).await.unwrap();
+        assert!(!alice_bob_chat.can_send(&alice).await?);
+
+        // Alice's UI should still be able to save a draft, which Alice started to type right when she got Bob's message:
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("Draftttt".to_string());
+        alice_bob_chat.id.set_draft(&alice, Some(&mut msg)).await?;
+        assert_eq!(
+            alice_bob_chat.id.get_draft(&alice).await?.unwrap().text,
+            "Draftttt"
+        );
+    }
+
+    tcm.execute_securejoin(&alice, &bob_new).await;
+    assert_verified(&alice, &bob_new, ProtectionStatus::Protected).await;
+
+    Ok(())
+}
+
+/// Regression test:
+/// - Verify a contact
+/// - The contact stops using DC and sends a message from a classical MUA instead
+/// - Delete the 1:1 chat
+/// - Create a 1:1 chat
+/// - Check that the created chat is not marked as protected
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_create_oneonone_chat_with_former_verified_contact() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = tcm.alice().await;
+    let bob = tcm.bob().await;
+    enable_verified_oneonone_chats(&[&alice]).await;
+
+    mark_as_verified(&alice, &bob).await;
+
+    receive_imf(
+        &alice,
+        b"Subject: Message from bob\r\n\
+          From: <bob@example.net>\r\n\
+          To: <alice@example.org>\r\n\
+          Date: Mon, 12 Dec 2022 14:33:39 +0000\r\n\
+          Message-ID: <abcd@example.net>\r\n\
+          \r\n\
+          Heyho!\r\n",
+        false,
+    )
+    .await
+    .unwrap()
+    .unwrap();
+
+    alice.create_chat(&bob).await;
+
+    assert_verified(&alice, &bob, ProtectionStatus::Unprotected).await;
+
+    Ok(())
+}
+
+// ============== Helper Functions ==============
+
+async fn assert_verified(this: &TestContext, other: &TestContext, protected: ProtectionStatus) {
+    let contact = this.add_or_lookup_contact(other).await;
+    assert_eq!(
+        contact.is_verified(this).await.unwrap(),
+        VerifiedStatus::BidirectVerified
+    );
+
+    let chat = this.get_chat(other).await.unwrap();
+    let (expect_protected, expect_broken) = match protected {
+        ProtectionStatus::Unprotected => (false, false),
+        ProtectionStatus::Protected => (true, false),
+        ProtectionStatus::ProtectionBroken => (false, true),
+    };
+    assert_eq!(chat.is_protected(), expect_protected);
+    assert_eq!(chat.is_protection_broken(), expect_broken);
+}
+
+async fn enable_verified_oneonone_chats(test_contexts: &[&TestContext]) {
+    for t in test_contexts {
+        t.set_config_bool(Config::VerifiedOneOnOneChats, true)
+            .await
+            .unwrap()
+    }
+}

src/tools.rs

@@ -185,16 +185,14 @@ pub(crate) async fn maybe_add_time_based_warnings(context: &Context) {
 async fn maybe_warn_on_bad_time(context: &Context, now: i64, known_past_timestamp: i64) -> bool {
     if now < known_past_timestamp {
         let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some(
-            stock_str::bad_time_msg_body(
-                context,
-                &Local.timestamp_opt(now, 0).single().map_or_else(
-                    || "YY-MM-DD hh:mm:ss".to_string(),
-                    |ts| ts.format("%Y-%m-%d %H:%M:%S").to_string(),
-                ),
-            )
-            .await,
-        );
+        msg.text = stock_str::bad_time_msg_body(
+            context,
+            &Local.timestamp_opt(now, 0).single().map_or_else(
+                || "YY-MM-DD hh:mm:ss".to_string(),
+                |ts| ts.format("%Y-%m-%d %H:%M:%S").to_string(),
+            ),
+        )
+        .await;
         if let Some(timestamp) = chrono::NaiveDateTime::from_timestamp_opt(now, 0) {
             add_device_msg_with_importance(
                 context,
@@ -221,7 +219,7 @@ async fn maybe_warn_on_bad_time(context: &Context, now: i64, known_past_timestam
 async fn maybe_warn_on_outdated(context: &Context, now: i64, approx_compile_time: i64) {
     if now > approx_compile_time + DC_OUTDATED_WARNING_DAYS * 24 * 60 * 60 {
         let mut msg = Message::new(Viewtype::Text);
-        msg.text = Some(stock_str::update_reminder_msg_body(context).await);
+        msg.text = stock_str::update_reminder_msg_body(context).await;
         if let Some(timestamp) = chrono::NaiveDateTime::from_timestamp_opt(now, 0) {
             add_device_msg(
                 context,
@@ -704,7 +702,7 @@ pub(crate) fn buf_decompress(buf: &[u8]) -> Result<Vec<u8>> {
 }
 
 const RTLO_CHARACTERS: [char; 5] = ['\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}'];
-/// This method strips all occurances of the RTLO Unicode character.
+/// This method strips all occurrences of the RTLO Unicode character.
 /// [Why is this needed](https://github.com/deltachat/deltachat-core-rust/issues/3479)?
 pub(crate) fn strip_rtlo_characters(input_str: &str) -> String {
     input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "")
@@ -715,7 +713,7 @@ mod tests {
     #![allow(clippy::indexing_slicing)]
 
     use super::*;
-    use crate::{message::get_msg_info, receive_imf::receive_imf, test_utils::TestContext};
+    use crate::{receive_imf::receive_imf, test_utils::TestContext};
 
     #[test]
     fn test_parse_receive_headers() {
@@ -788,7 +786,7 @@ DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
         let t = TestContext::new_alice().await;
         receive_imf(&t, raw, false).await.unwrap();
         let msg = t.get_last_msg().await;
-        let msg_info = get_msg_info(&t, msg.id).await.unwrap();
+        let msg_info = msg.id.get_info(&t).await.unwrap();
 
         // Ignore the first rows of the msg_info because they contain a
         // received time that depends on the test time which makes it impossible to

src/webxdc.rs

@@ -13,6 +13,7 @@ use serde_json::Value;
 use tokio::io::AsyncReadExt;
 
 use crate::chat::Chat;
+use crate::constants::Chattype;
 use crate::contact::ContactId;
 use crate::context::Context;
 use crate::download::DownloadState;
@@ -518,7 +519,7 @@ impl Context {
                 let mut status_update = Message {
                     chat_id: instance.chat_id,
                     viewtype: Viewtype::Text,
-                    text: Some(descr.to_string()),
+                    text: descr.to_string(),
                     hidden: true,
                     ..Default::default()
                 };
@@ -560,6 +561,7 @@ impl Context {
         json: &str,
     ) -> Result<()> {
         let msg = Message::load_from_db(self, msg_id).await?;
+        let chat_id = msg.chat_id;
         let (timestamp, mut instance, can_info_msg) = if msg.viewtype == Viewtype::Webxdc {
             (msg.timestamp_sort, msg, false)
         } else if let Some(parent) = msg.parent(self).await? {
@@ -577,7 +579,14 @@ impl Context {
         if from_id != ContactId::SELF
             && !chat::is_contact_in_chat(self, instance.chat_id, from_id).await?
         {
-            bail!("receive_status_update: status sender not chat member.")
+            let chat_type: Chattype = self
+                .sql
+                .query_get_value("SELECT type FROM chats WHERE id=?", (chat_id,))
+                .await?
+                .with_context(|| format!("Chat type for chat {chat_id} not found"))?;
+            if chat_type != Chattype::Mailinglist {
+                bail!("receive_status_update: status sender not chat member.")
+            }
         }
 
         let updates: StatusUpdates = serde_json::from_str(json)?;
@@ -828,9 +837,9 @@ mod tests {
     use crate::chatlist::Chatlist;
     use crate::config::Config;
     use crate::contact::Contact;
-    use crate::message;
     use crate::receive_imf::{receive_imf, receive_imf_inner};
     use crate::test_utils::TestContext;
+    use crate::{message, sql};
 
     #[allow(clippy::assertions_on_constants)]
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1177,7 +1186,7 @@ mod tests {
         assert_eq!(bob_instance.download_state, DownloadState::Available);
 
         // Bob downloads instance, updates should be assigned correctly
-        receive_imf_inner(
+        let received_msg = receive_imf_inner(
             &bob,
             &alice_instance.rfc724_mid,
             sent1.payload().as_bytes(),
@@ -1185,7 +1194,9 @@ mod tests {
             None,
             false,
         )
-        .await?;
+        .await?
+        .unwrap();
+        assert_eq!(*received_msg.msg_ids.get(0).unwrap(), bob_instance.id);
         let bob_instance = bob.get_last_msg().await;
         assert_eq!(bob_instance.viewtype, Viewtype::Webxdc);
         assert_eq!(bob_instance.download_state, DownloadState::Done);
@@ -1205,6 +1216,66 @@ mod tests {
     async fn test_delete_webxdc_instance() -> Result<()> {
         let t = TestContext::new_alice().await;
         let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo").await?;
+        let instance = send_webxdc_instance(&t, chat_id).await?;
+        t.receive_status_update(
+            ContactId::SELF,
+            instance.id,
+            r#"{"updates":[{"payload":1}]}"#,
+        )
+        .await?;
+        assert_eq!(
+            t.sql
+                .count("SELECT COUNT(*) FROM msgs_status_updates;", ())
+                .await?,
+            1
+        );
+
+        message::delete_msgs(&t, &[instance.id]).await?;
+        sql::housekeeping(&t).await?;
+        assert_eq!(
+            t.sql
+                .count("SELECT COUNT(*) FROM msgs_status_updates;", ())
+                .await?,
+            0
+        );
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_delete_chat_with_webxdc() -> Result<()> {
+        let t = TestContext::new_alice().await;
+        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo").await?;
+        let instance = send_webxdc_instance(&t, chat_id).await?;
+        t.receive_status_update(
+            ContactId::SELF,
+            instance.id,
+            r#"{"updates":[{"payload":1}, {"payload":2}]}"#,
+        )
+        .await?;
+        assert_eq!(
+            t.sql
+                .count("SELECT COUNT(*) FROM msgs_status_updates;", ())
+                .await?,
+            2
+        );
+
+        chat_id.delete(&t).await?;
+        sql::housekeeping(&t).await?;
+        assert_eq!(
+            t.sql
+                .count("SELECT COUNT(*) FROM msgs_status_updates;", ())
+                .await?,
+            0
+        );
+
+        Ok(())
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_delete_webxdc_draft() -> Result<()> {
+        let t = TestContext::new_alice().await;
+        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo").await?;
 
         let mut instance = create_webxdc_instance(
             &t,
@@ -1464,7 +1535,7 @@ mod tests {
         assert!(alice_update.hidden);
         assert_eq!(alice_update.viewtype, Viewtype::Text);
         assert_eq!(alice_update.get_filename(), None);
-        assert_eq!(alice_update.text, Some("descr text".to_string()));
+        assert_eq!(alice_update.text, "descr text".to_string());
         assert_eq!(alice_update.chat_id, alice_instance.chat_id);
         assert_eq!(
             alice_update.parent(&alice).await?.unwrap().id,
@@ -2131,10 +2202,7 @@ sth_for_the = "future""#
         assert!(info_msg.is_info());
         assert_eq!(info_msg.get_info_type(), SystemMessage::WebxdcInfoMessage);
         assert_eq!(info_msg.from_id, ContactId::SELF);
-        assert_eq!(
-            info_msg.get_text(),
-            Some("this appears in-chat".to_string())
-        );
+        assert_eq!(info_msg.get_text(), "this appears in-chat");
         assert_eq!(
             info_msg.parent(&alice).await?.unwrap().id,
             alice_instance.id
@@ -2156,10 +2224,7 @@ sth_for_the = "future""#
         assert!(info_msg.is_info());
         assert_eq!(info_msg.get_info_type(), SystemMessage::WebxdcInfoMessage);
         assert!(!info_msg.from_id.is_special());
-        assert_eq!(
-            info_msg.get_text(),
-            Some("this appears in-chat".to_string())
-        );
+        assert_eq!(info_msg.get_text(), "this appears in-chat");
         assert_eq!(info_msg.parent(&bob).await?.unwrap().id, bob_instance.id);
         assert!(info_msg.quoted_message(&bob).await?.is_none());
         assert_eq!(
@@ -2178,10 +2243,7 @@ sth_for_the = "future""#
         assert!(info_msg.is_info());
         assert_eq!(info_msg.get_info_type(), SystemMessage::WebxdcInfoMessage);
         assert_eq!(info_msg.from_id, ContactId::SELF);
-        assert_eq!(
-            info_msg.get_text(),
-            Some("this appears in-chat".to_string())
-        );
+        assert_eq!(info_msg.get_text(), "this appears in-chat");
         assert_eq!(
             info_msg.parent(&alice2).await?.unwrap().id,
             alice2_instance.id
@@ -2220,7 +2282,7 @@ sth_for_the = "future""#
         let sent3 = &alice.pop_sent_msg().await;
         assert_eq!(alice_chat.id.get_msg_cnt(&alice).await?, 2);
         let info_msg = alice.get_last_msg().await;
-        assert_eq!(info_msg.get_text(), Some("i2".to_string()));
+        assert_eq!(info_msg.get_text(), "i2");
 
         // When Bob receives the messages, they should be cleaned up as well
         let bob_instance = bob.recv_msg(sent1).await;
@@ -2230,7 +2292,7 @@ sth_for_the = "future""#
         bob.recv_msg(sent3).await;
         assert_eq!(bob_chat_id.get_msg_cnt(&bob).await?, 2);
         let info_msg = bob.get_last_msg().await;
-        assert_eq!(info_msg.get_text(), Some("i2".to_string()));
+        assert_eq!(info_msg.get_text(), "i2");
 
         Ok(())
     }
@@ -2383,26 +2445,20 @@ sth_for_the = "future""#
             include_bytes!("../test-data/webxdc/minimal.xdc"),
         )
         .await?;
-        alice_instance.set_text(Some("user added text".to_string()));
+        alice_instance.set_text("user added text".to_string());
         send_msg(&alice, alice_chat.id, &mut alice_instance).await?;
         let alice_instance = alice.get_last_msg().await;
-        assert_eq!(
-            alice_instance.get_text(),
-            Some("user added text".to_string())
-        );
+        assert_eq!(alice_instance.get_text(), "user added text");
 
         // Bob receives that instance
         let sent1 = alice.pop_sent_msg().await;
         let bob_instance = bob.recv_msg(&sent1).await;
-        assert_eq!(bob_instance.get_text(), Some("user added text".to_string()));
+        assert_eq!(bob_instance.get_text(), "user added text");
 
         // Alice's second device receives the instance as well
         let alice2 = TestContext::new_alice().await;
         let alice2_instance = alice2.recv_msg(&sent1).await;
-        assert_eq!(
-            alice2_instance.get_text(),
-            Some("user added text".to_string())
-        );
+        assert_eq!(alice2_instance.get_text(), "user added text");
 
         Ok(())
     }

test-data/golden/test_outgoing_mua_msg

@@ -0,0 +1,7 @@
+Single#Chat#10: bob@example.net [bob@example.net] 🛡️
+--------------------------------------------------------------------------------
+Msg#10: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
+Msg#11🔒:  (Contact#Contact#10): Heyho from DC [FRESH]
+Msg#12: Me (Contact#Contact#Self): One classical MUA message  √
+Msg#13🔒: Me (Contact#Contact#Self): Sending with DC again  √
+--------------------------------------------------------------------------------