ci: update to Python 3.13

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     name: Lint Rust
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: 1.80.0
+      RUSTUP_TOOLCHAIN: 1.78.0
     steps:
       - uses: actions/checkout@v4
         with:
@@ -95,11 +95,11 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            rust: 1.80.0
+            rust: 1.78.0
           - os: windows-latest
-            rust: 1.80.0
+            rust: 1.78.0
           - os: macos-latest
-            rust: 1.80.0
+            rust: 1.78.0
 
           # Minimum Supported Rust Version = 1.77.0
           - os: ubuntu-latest
@@ -209,11 +209,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Currently used Rust version.
+          # Currently used Python version.
           - os: ubuntu-latest
-            python: 3.12
+            python: 3.13
           - os: macos-latest
-            python: 3.12
+            python: 3.13
 
           # PyPy tests
           - os: ubuntu-latest
@@ -243,6 +243,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
+          allow-prereleases: true
 
       - name: Install tox
         run: pip install tox
@@ -263,11 +264,11 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            python: 3.12
+            python: 3.13
           - os: macos-latest
-            python: 3.12
+            python: 3.13
           - os: windows-latest
-            python: 3.12
+            python: 3.13
 
           # PyPy tests
           - os: ubuntu-latest
@@ -289,6 +290,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
+          allow-prereleases: true
 
       - name: Install tox
         run: pip install tox

CHANGELOG.md

@@ -1,258 +1,5 @@
 # Changelog
 
-## [1.142.1] - 2024-07-30
-
-### Features / Changes
-
-- Do not reveal sender's language in read receipts ([#5802](https://github.com/deltachat/deltachat-core-rust/pull/5802)).
-- Try next DNS resolution result if TLS setup fails.
-- Report first error instead of the last on connection failure.
-
-### Fixes
-
-- smtp: Use DNS cache for implicit TLS connections.
-- Imex::import_backup: Unpack all blobs before importing a db ([#4307](https://github.com/deltachat/deltachat-core-rust/pull/4307)).
-- Import_backup_stream: Fix progress stucking at 0.
-- Sql::import: Detach backup db if any step of the import fails.
-- Imex::import_backup: Ignore errors from delete_and_reset_all_device_msgs().
-- Explicitly close the database on account removal.
-
-### Miscellaneous Tasks
-
-- cargo: Update time from 0.3.34 to 0.3.36.
-- cargo: Update iroh from 0.20.0 to 0.21.0.
-
-### Refactor
-
-- Add net/dns submodule.
-- Pass single ALPN around instead of ALPN list.
-- Replace {IMAP,SMTP,HTTP}_TIMEOUT with a single constant.
-- smtp: Unify SMTP connection setup between TLS and STARTTLS.
-- imap: Unify IMAP connection setup in Client::connect().
-- Move DNS resolution into IMAP and SMTP connect code.
-
-### CI
-
-- Update Rust to 1.80.0.
-
-## [1.142.0] - 2024-07-23
-
-### API-Changes
-
-- deltachat-jsonrpc: Add `pinned` property to `FullChat` and `BasicChat`.
-- deltachat-jsonrpc: Allow to set message quote text without referencing quoted message ([#5695](https://github.com/deltachat/deltachat-core-rust/pull/5695)).
-
-### Features / Changes
-
-- cargo: Update iroh from 0.17 to 0.20.
-- iroh: Pass direct addresses from Endpoint to Gossip.
-- New BACKUP2 transfer protocol.
-- Use `[...]` instead of `...` for protected subject.
-- Add email address and fingerprint to exported key file names ([#5694](https://github.com/deltachat/deltachat-core-rust/pull/5694)).
-- Request `imap` ALPN for IMAP TLS connections and `smtp` ALPN for SMTP TLS connections.
-- Limit the size of aggregated WebXDC update to 100 KiB ([#4825](https://github.com/deltachat/deltachat-core-rust/pull/4825)).
-- Don't create ad-hoc group on a member removal message ([#5618](https://github.com/deltachat/deltachat-core-rust/pull/5618)).
-- Don't unarchive a group on a member removal except SELF ([#5618](https://github.com/deltachat/deltachat-core-rust/pull/5618)).
-- Use custom DNS resolver for HTTP(S).
-- Promote fallback DNS results to cached on successful use.
-- Set summary thumbnail path for WebXDCs to "webxdc-icon://last-msg-id" ([#5782](https://github.com/deltachat/deltachat-core-rust/pull/5782)).
-- Do not show the address in invite QR code SVG.
-- Report better error from DcKey::from_asc() ([#5539](https://github.com/deltachat/deltachat-core-rust/pull/5539)).
-- Contact::create_ex: Don't send sync message if nothing changed ([#5705](https://github.com/deltachat/deltachat-core-rust/pull/5705)).
-
-### Fixes
-
-- `Message::set_quote`: Don't forget to remove `Param::ProtectQuote`.
-- Randomize avatar blob filenames to work around caching.
-- Correct copy-pasted DCACCOUNT parsing errors message.
-- Call `send_sync_msg()` only from the SMTP loop ([#5780](https://github.com/deltachat/deltachat-core-rust/pull/5780)).
-- Emit MsgsChanged if the number of unnoticed archived chats could decrease ([#5768](https://github.com/deltachat/deltachat-core-rust/pull/5768)).
-- Reject message with forged From even if no valid signatures are found.
-
-### Refactor
-
-- Move key transfer into its own submodule.
-- Move TempPathGuard into `tools` and use instead of `DeleteOnDrop`.
-- Return error from export_backup() without logging.
-- Reduce boilerplate for migration version increment.
-
-### Tests
-
-- Add test for `get_http_response` JSON-RPC call.
-
-### Build system
-
-- node: Pin node-gyp to version 10.1.
-
-### Miscellaneous Tasks
-
-- cargo: Update hashlink to remove allocator-api2 dependency.
-- cargo: Update openssl to v0.10.66.
-- deps: Bump openssl from 0.10.60 to 0.10.66 in /fuzz.
-- cargo: Update `image` crate to 0.25.2.
-
-## [1.141.2] - 2024-07-09
-
-### Features / Changes
-
-- Add `is_muted` config option.
-- Parse vcards exported by protonmail ([#5723](https://github.com/deltachat/deltachat-core-rust/pull/5723)).
-- Disable sending sync messages for bots ([#5705](https://github.com/deltachat/deltachat-core-rust/pull/5705)).
-
-### Fixes
-
-- Don't fail if going to send plaintext, but some peerstate is missing.
-- Correctly sanitize input everywhere ([#5697](https://github.com/deltachat/deltachat-core-rust/pull/5697)).
-- Do not try to register non-iOS tokens for heartbeats.
-- imap: Reset new_mail if folder is ignored.
-- Use and prefer Date from signed message part ([#5716](https://github.com/deltachat/deltachat-core-rust/pull/5716)).
-- Distinguish between database errors and no gossip topic.
-- MimeFactory::verified: Return true for self-chat.
-
-### Refactor
-
-- `MimeFactory::is_e2ee_guaranteed()`: always respect `Param::ForcePlaintext`.
-- Protect from reusing migration versions ([#5719](https://github.com/deltachat/deltachat-core-rust/pull/5719)).
-- Move `quota_needs_update` calculation to a separate function ([#5683](https://github.com/deltachat/deltachat-core-rust/pull/5683)).
-
-### Documentation
-
-- Document vCards in the specification ([#5724](https://github.com/deltachat/deltachat-core-rust/pull/5724))
-
-### Miscellaneous Tasks
-
-- cargo: Bump toml from 0.8.13 to 0.8.14.
-- cargo: Bump serde_json from 1.0.117 to 1.0.120.
-- cargo: Bump syn from 2.0.66 to 2.0.68.
-- cargo: Bump async-broadcast from 0.7.0 to 0.7.1.
-- cargo: Bump url from 2.5.0 to 2.5.2.
-- cargo: Bump log from 0.4.21 to 0.4.22.
-- cargo: Bump regex from 1.10.4 to 1.10.5.
-- cargo: Bump proptest from 1.4.0 to 1.5.0.
-- cargo: Bump uuid from 1.8.0 to 1.9.1.
-- cargo: Bump backtrace from 0.3.72 to 0.3.73.
-- cargo: Bump quick-xml from 0.31.0 to 0.35.0.
-- cargo: Update yerpc to 0.6.2.
-- cargo: Update rPGP from 0.11 to 0.13.
-
-## [1.141.1] - 2024-06-27
-
-### Fixes
-
-- Update quota if it's stale, not fresh ([#5683](https://github.com/deltachat/deltachat-core-rust/pull/5683)).
-- sql: Assign migration adding msgs.deleted a new number.
-
-### Refactor
-
-- mimefactory: Factor out header confidentiality policy ([#5715](https://github.com/deltachat/deltachat-core-rust/pull/5715)).
-- Improve logging during SMTP/IMAP configuration.
-
-## [1.141.0] - 2024-06-24
-
-### API-Changes
-
-- deltachat-jsonrpc: Add `get_chat_securejoin_qr_code()`.
-- api!(deltachat-rpc-client): make {Account,Chat}.get_qr_code() return no SVG
-  This is a breaking change, old method is renamed into `get_qr_code_svg()`.
-
-### Features / Changes
-
-- Prefer references to fully downloaded messages for chat assignment ([#5645](https://github.com/deltachat/deltachat-core-rust/pull/5645)).
-- Protect From name for verified chats and To names for encrypted chats ([#5166](https://github.com/deltachat/deltachat-core-rust/pull/5166)).
-- Display vCard contact name in the message summary.
-- Case-insensitive search for non-ASCII messages ([#5052](https://github.com/deltachat/deltachat-core-rust/pull/5052)).
-- Remove subject prefix from ad-hoc group names ([#5385](https://github.com/deltachat/deltachat-core-rust/pull/5385)).
-- Replace "Unnamed group" with "👥📧" to avoid translation.
-- Sync `Config::MvboxMove` across devices ([#5680](https://github.com/deltachat/deltachat-core-rust/pull/5680)).
-- Don't reveal profile data to a not yet verified contact ([#5166](https://github.com/deltachat/deltachat-core-rust/pull/5166)).
-- Don't reveal profile data in MDNs ([#5166](https://github.com/deltachat/deltachat-core-rust/pull/5166)).
-
-### Fixes
-
-- Fetch existing messages for bots as `InFresh` ([#4976](https://github.com/deltachat/deltachat-core-rust/pull/4976)).
-- Keep tombstones for two days before deleting ([#3685](https://github.com/deltachat/deltachat-core-rust/pull/3685)).
-- Housekeeping: Delete MDNs and webxdc status updates for tombstones.
-- Delete user-deleted messages on the server even if they show up on IMAP later.
-- Do not send sync messages if bcc_self is disabled.
-- Don't generate Config sync messages for unconfigured accounts.
-- Do not require the Message to render MDN.
-
-### CI
-
-- Update Rust to 1.79.0.
-
-### Documentation
-
-- Remove outdated documentation comment from `send_smtp_messages`.
-- Remove misleading configuration comment.
-
-### Miscellaneous Tasks
-
-- Update curve25519-dalek 4.1.x and suppress 3.2.0 warning.
-- Update provider database.
-
-### Refactor
-
-- Deduplicate dependency versions ([#5691](https://github.com/deltachat/deltachat-core-rust/pull/5691)).
-- Store public key instead of secret key for peer channels.
-
-### Tests
-
-- Image drafted as Viewtype::File is sent as is.
-- python: Set delete_server_after=1 ("delete immediately") for bots ([#4976](https://github.com/deltachat/deltachat-core-rust/pull/4976)).
-- deltachat-rpc-client: Test that webxdc realtime data is not reordered on the sender.
-- python: Wait for bot's DC_EVENT_IMAP_INBOX_IDLE before sending messages to it ([#5699](https://github.com/deltachat/deltachat-core-rust/pull/5699)).
-
-## [1.140.2] - 2024-06-07
-
-### API-Changes
-
-- jsonrpc: Add set_draft_vcard(.., msg_id, contacts).
-
-### Fixes
-
-- Allow fetch_existing_msgs for bots ([#4976](https://github.com/deltachat/deltachat-core-rust/pull/4976)).
-- Remove group member locally even if send_msg() fails ([#5508](https://github.com/deltachat/deltachat-core-rust/pull/5508)).
-- Revert member addition if the corresponding message couldn't be sent ([#5508](https://github.com/deltachat/deltachat-core-rust/pull/5508)).
-- @deltachat/stdio-rpc-server: Make local non-symlinked installation possible by using absolute paths for local dev version ([#5679](https://github.com/deltachat/deltachat-core-rust/pull/5679)).
-
-### Miscellaneous Tasks
-
-- cargo: Bump schemars from 0.8.19 to 0.8.21.
-- cargo: Bump backtrace from 0.3.71 to 0.3.72.
-
-### Refactor
-
-- @deltachat/stdio-rpc-server: Use old school require instead of the experimental json import ([#5628](https://github.com/deltachat/deltachat-core-rust/pull/5628)).
-
-### Tests
-
-- Set fetch_existing_msgs for bots ([#4976](https://github.com/deltachat/deltachat-core-rust/pull/4976)).
-- Don't leave protected group if some member's key is missing ([#5508](https://github.com/deltachat/deltachat-core-rust/pull/5508)).
-
-## [1.140.1] - 2024-06-05
-
-### Fixes
-
-- Retry sending MDNs on temporary error.
-- Set Config::IsChatmail in configure().
-- Do not miss new messages while expunging the folder.
-- Log messages with `info!` instead of `println!`.
-
-### Documentation
-
-- imap: Document why CLOSE is faster than EXPUNGE.
-
-### Refactor
-
-- imap: Make select_folder() accept non-optional folder.
-- Improve SMTP logs and errors.
-- Remove unused `select_folder::Error` variants.
-
-### Tests
-
-- deltachat-rpc-client: reenable `log_cli`.
-
 ## [1.140.0] - 2024-06-04
 
 ### Features / Changes
@@ -4624,10 +4371,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.139.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.4...v1.139.5
 [1.139.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.5...v1.139.6
 [1.140.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.6...v1.140.0
-[1.140.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.140.0...v1.140.1
-[1.140.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.140.1...v1.140.2
-[1.141.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.140.2...v1.141.0
-[1.141.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.141.0...v1.141.1
-[1.141.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.141.1...v1.141.2
-[1.142.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.141.2...v1.142.0
-[1.142.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.0...v1.142.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.142.1"
+version = "1.140.0"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -39,54 +39,54 @@ format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }
 
 anyhow = { workspace = true }
-async-broadcast = "0.7.1"
-async-channel = { workspace = true }
+async-broadcast = "0.7.0"
+async-channel = "2.2.1"
 async-imap = { version = "0.9.7", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
 backtrace = "0.3"
-base64 = { workspace = true }
+base64 = "0.22"
 brotli = { version = "6", default-features=false, features = ["std"] }
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
+chrono = { workspace = true }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
 fast-socks5 = "0.9"
 fd-lock = "4"
-futures = { workspace = true }
-futures-lite = { workspace = true }
+futures = "0.3"
+futures-lite = "2.3.0"
 hex = "0.4.0"
 hickory-resolver = "0.24"
 humansize = "2"
 image = { version = "0.25.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 iroh_old = { version = "0.4.2", default-features = false, package = "iroh"}
-iroh-net = { version = "0.21.0", default-features = false }
-iroh-gossip = { version = "0.21.0", default-features = false, features = ["net"] }
+iroh-net = "0.17.0"
+iroh-gossip = { version = "0.17.0", features = ["net"] }
 quinn = "0.10.0"
 kamadak-exif = "0.5.3"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
-libc = { workspace = true }
+libc = "0.2"
 mailparse = "0.15"
 mime = "0.3.17"
 num_cpus = "1.16"
 num-derive = "0.4"
-num-traits = { workspace = true }
+num-traits = "0.2"
 once_cell = { workspace = true }
 percent-encoding = "2.3"
 parking_lot = "0.12"
-pgp = { version = "0.13", default-features = false }
+pgp = { version = "0.11", default-features = false }
 qrcodegen = "1.7.0"
-quick-xml = "0.35"
+quick-xml = "0.31"
 quoted_printable = "0.5"
-rand = { workspace = true }
+rand = "0.8"
 regex = { workspace = true }
-reqwest = { version = "0.12.5", features = ["json"] }
+reqwest = { version = "0.11.27", features = ["json"] }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-sanitize-filename = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
+sanitize-filename = "0.5"
+serde_json = "1"
+serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
 smallvec = "1.13.2"
@@ -94,26 +94,26 @@ strum = "0.26"
 strum_macros = "0.26"
 tagger = "4.3.4"
 textwrap = "0.16.1"
-thiserror = { workspace = true }
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
+thiserror = "1"
+tokio = { version = "1.37.0", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
 tokio-stream = { version = "0.1.15", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-tokio-util = { workspace = true }
+tokio-util = "0.7.9"
 toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 
 [dev-dependencies]
-ansi_term = { workspace = true }
-anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
+ansi_term = "0.12.0"
+anyhow = { version = "1", features = ["backtrace"] } # Enable `backtrace` feature in tests.
 criterion = { version = "0.5.1", features = ["async_tokio"] }
-futures-lite = { workspace = true }
-log = { workspace = true }
+futures-lite = "2.3.0"
+log = "0.4"
 proptest = { version = "1", default-features = false, features = ["std"] }
-tempfile = { workspace = true }
+tempfile = "3"
 testdir = "0.9.0"
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.37.0", features = ["parking_lot", "rt-multi-thread", "macros"] }
 pretty_assertions = "1.3.0"
 
 [workspace]
@@ -159,28 +159,10 @@ harness = false
 
 [workspace.dependencies]
 anyhow = "1"
-ansi_term = "0.12.1"
-async-channel = "2.3.1"
-base64 = "0.22"
-chrono = { version = "0.4.38", default-features = false }
-futures = "0.3.30"
-futures-lite = "2.3.0"
-libc = "0.2"
-log = "0.4"
-num-traits = "0.2"
 once_cell = "1.18.0"
-rand = "0.8"
 regex = "1.10"
 rusqlite = "0.31"
-sanitize-filename = "0.5"
-serde_json = "1"
-serde = "1.0"
-tempfile = "3.10.1"
-thiserror = "1"
-tokio = "1.38.0"
-tokio-util = "0.7.11"
-tracing-subscriber = "0.3"
-yerpc = "0.6.2"
+chrono = { version = "0.4.38", default-features=false, features = ["alloc", "clock", "std"] }
 
 [features]
 default = ["vendored"]
@@ -190,6 +172,3 @@ vendored = [
   "rusqlite/bundled-sqlcipher-vendored-openssl",
   "reqwest/native-tls-vendored"
 ]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }

deltachat-contact-tools/Cargo.toml

@@ -12,7 +12,7 @@ anyhow = { workspace = true }
 once_cell = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true } # Needed in order to `impl rusqlite::types::ToSql for EmailAddress`. Could easily be put behind a feature.
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
+chrono = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.

deltachat-contact-tools/src/lib.rs

@@ -22,8 +22,7 @@
     clippy::bool_assert_comparison,
     clippy::manual_split_once,
     clippy::format_push_string,
-    clippy::bool_to_int_with_if,
-    clippy::manual_range_contains
+    clippy::bool_to_int_with_if
 )]
 
 use std::fmt;
@@ -36,6 +35,10 @@ use chrono::{DateTime, NaiveDateTime};
 use once_cell::sync::Lazy;
 use regex::Regex;
 
+// TODOs to clean up:
+// - Check if sanitizing is done correctly everywhere
+// - Apply lints everywhere (https://doc.rust-lang.org/cargo/reference/workspaces.html#the-lints-table)
+
 #[derive(Debug)]
 /// A Contact, as represented in a VCard.
 pub struct VcardContact {
@@ -112,9 +115,7 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
         // If `s` is `EMAIL;TYPE=work:alice@example.com` and `property` is `EMAIL`,
         // then `remainder` is now `;TYPE=work:alice@example.com`
 
-        // Note: This doesn't handle the case where there are quotes around a colon,
-        // like `NAME;Foo="Some quoted text: that contains a colon":value`.
-        // This could be improved in the future, but for now, the parsing is good enough.
+        // TODO this doesn't handle the case where there are quotes around a colon
         let (params, value) = remainder.split_once(':')?;
         // In the example from above, `params` is now `;TYPE=work`
         // and `value` is now `alice@example.com`
@@ -174,15 +175,7 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
         let mut photo = None;
         let mut datetime = None;
 
-        for mut line in lines.by_ref() {
-            if let Some(remainder) = remove_prefix(line, "item1.") {
-                // Remove the group name, if the group is called "item1".
-                // If necessary, we can improve this to also remove groups that are called something different that "item1".
-                //
-                // Search "group name" at https://datatracker.ietf.org/doc/html/rfc6350 for more infos.
-                line = remainder;
-            }
-
+        for line in lines.by_ref() {
             if let Some(email) = vcard_property(line, "email") {
                 addr.get_or_insert(email);
             } else if let Some(name) = vcard_property(line, "fn") {
@@ -190,7 +183,6 @@ pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
             } else if let Some(k) = remove_prefix(line, "KEY;PGP;ENCODING=BASE64:")
                 .or_else(|| remove_prefix(line, "KEY;TYPE=PGP;ENCODING=b:"))
                 .or_else(|| remove_prefix(line, "KEY:data:application/pgp-keys;base64,"))
-                .or_else(|| remove_prefix(line, "KEY;PREF=1:data:application/pgp-keys;base64,"))
             {
                 key.get_or_insert(k);
             } else if let Some(p) = remove_prefix(line, "PHOTO;JPEG;ENCODING=BASE64:")
@@ -271,27 +263,27 @@ impl rusqlite::types::ToSql for ContactAddress {
     }
 }
 
-/// Takes a name and an address and sanitizes them:
-/// - Extracts a name from the addr if the addr is in form "Alice <alice@example.org>"
-/// - Removes special characters from the name, see [`sanitize_name()`]
-/// - Removes the name if it is equal to the address by setting it to ""
+/// Make the name and address
 pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
     static ADDR_WITH_NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("(.*)<(.*)>").unwrap());
     let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
         (
             if name.is_empty() {
-                captures.get(1).map_or("", |m| m.as_str())
+                strip_rtlo_characters(captures.get(1).map_or("", |m| m.as_str()))
             } else {
-                name
+                strip_rtlo_characters(name)
             },
             captures
                 .get(2)
                 .map_or("".to_string(), |m| m.as_str().to_string()),
         )
     } else {
-        (name, addr.to_string())
+        (
+            strip_rtlo_characters(&normalize_name(name)),
+            addr.to_string(),
+        )
     };
-    let mut name = sanitize_name(name);
+    let mut name = normalize_name(&name);
 
     // If the 'display name' is just the address, remove it:
     // Otherwise, the contact would sometimes be shown as "alice@example.com (alice@example.com)" (see `get_name_n_addr()`).
@@ -303,77 +295,31 @@ pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
     (name, addr)
 }
 
-/// Sanitizes a name.
+/// Normalize a name.
 ///
-/// - Removes newlines and trims the string
-/// - Removes quotes (come from some bad MUA implementations)
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_name(name: &str) -> String {
-    let name = sanitize_single_line(name);
-
-    match name.as_bytes() {
-        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => name
-            .get(1..name.len() - 1)
-            .map_or("".to_string(), |s| s.trim().to_string()),
-        _ => name.to_string(),
+/// - Remove quotes (come from some bad MUA implementations)
+/// - Trims the resulting string
+///
+/// Typically, this function is not needed as it is called implicitly by `Contact::add_address_book`.
+pub fn normalize_name(full_name: &str) -> String {
+    let full_name = full_name.trim();
+    if full_name.is_empty() {
+        return full_name.into();
     }
-}
 
-/// Sanitizes user input
-///
-/// - Removes newlines and trims the string
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_single_line(input: &str) -> String {
-    sanitize_bidi_characters(input.replace(['\n', '\r'], " ").trim())
+    match full_name.as_bytes() {
+        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => full_name
+            .get(1..full_name.len() - 1)
+            .map_or("".to_string(), |s| s.trim().to_string()),
+        _ => full_name.to_string(),
+    }
 }
 
 const RTLO_CHARACTERS: [char; 5] = ['\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}'];
-const ISOLATE_CHARACTERS: [char; 3] = ['\u{2066}', '\u{2067}', '\u{2068}'];
-const POP_ISOLATE_CHARACTER: char = '\u{2069}';
-/// Some control unicode characters can influence whether adjacent text is shown from
-/// left to right or from right to left.
-///
-/// Since user input is not supposed to influence how adjacent text looks,
-/// this function removes some of these characters.
-///
-/// Also see https://github.com/deltachat/deltachat-core-rust/issues/3479.
-pub fn sanitize_bidi_characters(input_str: &str) -> String {
-    // RTLO_CHARACTERS are apparently rarely used in practice.
-    // They can impact all following text, so, better remove them all:
-    let input_str = input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "");
-
-    // If the ISOLATE characters are not ended with a POP DIRECTIONAL ISOLATE character,
-    // we regard the input as potentially malicious and simply remove all ISOLATE characters.
-    // See https://en.wikipedia.org/wiki/Bidirectional_text#Unicode_bidi_support
-    // and https://www.w3.org/International/questions/qa-bidi-unicode-controls.en
-    // for an explanation about ISOLATE characters.
-    fn isolate_characters_are_valid(input_str: &str) -> bool {
-        let mut isolate_character_nesting: i32 = 0;
-        for char in input_str.chars() {
-            if ISOLATE_CHARACTERS.contains(&char) {
-                isolate_character_nesting += 1;
-            } else if char == POP_ISOLATE_CHARACTER {
-                isolate_character_nesting -= 1;
-            }
-
-            // According to Wikipedia, 125 levels are allowed:
-            // https://en.wikipedia.org/wiki/Unicode_control_characters
-            // (although, in practice, we could also significantly lower this number)
-            if isolate_character_nesting < 0 || isolate_character_nesting > 125 {
-                return false;
-            }
-        }
-        isolate_character_nesting == 0
-    }
-
-    if isolate_characters_are_valid(&input_str) {
-        input_str
-    } else {
-        input_str.replace(
-            |char| ISOLATE_CHARACTERS.contains(&char) || POP_ISOLATE_CHARACTER == char,
-            "",
-        )
-    }
+/// This method strips all occurrences of the RTLO Unicode character.
+/// [Why is this needed](https://github.com/deltachat/deltachat-core-rust/issues/3479)?
+pub fn strip_rtlo_characters(input_str: &str) -> String {
+    input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "")
 }
 
 /// Returns false if addr is an invalid address, otherwise true.
@@ -722,89 +668,4 @@ END:VCARD
             assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
         }
     }
-
-    #[test]
-    fn test_protonmail_vcard() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN;PREF=1:Alice Wonderland
-UID:proton-web-03747582-328d-38dc-5ddd-000000000000
-ITEM1.EMAIL;PREF=1:alice@example.org
-ITEM1.KEY;PREF=1:data:application/pgp-keys;base64,aaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ITEM1.KEY;PREF=2:data:application/pgp-keys;base64,bbbbbbbbbbbbbbbbbbbbbbbbb
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-ITEM1.X-PM-ENCRYPT:true
-ITEM1.X-PM-SIGN:true
-END:VCARD",
-        );
-
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(&contacts[0].addr, "alice@example.org");
-        assert_eq!(&contacts[0].authname, "Alice Wonderland");
-        assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-        assert!(contacts[0].timestamp.is_err());
-        assert_eq!(contacts[0].profile_image, None);
-    }
-
-    #[test]
-    fn test_sanitize_name() {
-        assert_eq!(&sanitize_name(" hello world   "), "hello world");
-        assert_eq!(&sanitize_name("<"), "<");
-        assert_eq!(&sanitize_name(">"), ">");
-        assert_eq!(&sanitize_name("'"), "'");
-        assert_eq!(&sanitize_name("\""), "\"");
-    }
-
-    #[test]
-    fn test_sanitize_single_line() {
-        assert_eq!(sanitize_single_line("Hi\naiae "), "Hi aiae");
-        assert_eq!(sanitize_single_line("\r\nahte\n\r"), "ahte");
-    }
-
-    #[test]
-    fn test_sanitize_bidi_characters() {
-        // Legit inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat\u{2069}"),
-            "Tes\u{2067}ting Delta Chat\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"),
-            "Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"),
-            "Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"
-        );
-
-        // Potentially-malicious inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{202C}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Testing Delta Chat\u{2069}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2069}ting Delta Chat\u{2067}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2068}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-    }
 }

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.142.1"
+version = "1.140.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -16,16 +16,16 @@ crate-type = ["cdylib", "staticlib"]
 [dependencies]
 deltachat = { path = "../", default-features = false }
 deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
-libc = { workspace = true }
+libc = "0.2"
 human-panic = { version = "2", default-features = false }
-num-traits = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true, features = ["rt-multi-thread"] }
-anyhow = { workspace = true }
-thiserror = { workspace = true }
-rand = { workspace = true }
-once_cell = { workspace = true }
-yerpc = { workspace = true, features = ["anyhow_expose"] }
+num-traits = "0.2"
+serde_json = "1.0"
+tokio = { version = "1.37.0", features = ["rt-multi-thread"] }
+anyhow = "1"
+thiserror = "1"
+rand = "0.8"
+once_cell = "1.18.0"
+yerpc = { version = "0.5.1", features = ["anyhow_expose"] }
 
 [features]
 default = ["vendored"]

deltachat-ffi/deltachat.h

@@ -481,9 +481,8 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `bot`          = Set to "1" if this is a bot.
  *                    Prevents adding the "Device messages" and "Saved messages" chats,
  *                    adds Auto-Submitted header to outgoing messages,
- *                    accepts contact requests automatically (calling dc_accept_chat() is not needed),
- *                    does not cut large incoming text messages,
- *                    handles existing messages the same way as new ones if `fetch_existing_msgs=1`.
+ *                    accepts contact requests automatically (calling dc_accept_chat() is not needed for bots)
+ *                    and does not cut large incoming text messages.
  * - `last_msg_id` = database ID of the last message processed by the bot.
  *                   This ID and IDs below it are guaranteed not to be returned
  *                   by dc_get_next_msgs() and dc_wait_next_msgs().
@@ -494,8 +493,8 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                   For most bots calling `dc_markseen_msgs()` is the
  *                   recommended way to update this value
  *                   even for self-sent messages.
- * - `fetch_existing_msgs` = 0=do not fetch existing messages on configure (default),
- *                    1=fetch most recent existing messages on configure.
+ * - `fetch_existing_msgs` = 1=fetch most recent existing messages on configure (default),
+ *                    0=do not fetch existing messages on configure.
  *                    In both cases, existing recipients are added to the contact database.
  * - `disable_idle` = 1=disable IMAP IDLE even if the server supports it,
  *                    0=use IMAP IDLE if the server supports it.
@@ -519,11 +518,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    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.
  * - `is_chatmail` = 1 if the the server is a chatmail server, 0 otherwise.
- * - `is_muted`     = Whether a context is muted by the user.
- *                    Muted contexts should not sound, vibrate or show notifications.
- *                    In contrast to `dc_set_chat_mute_duration()`,
- *                    fresh message and badge counters are not changed by this setting,
- *                    but should be tuned down where appropriate.
  * - `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`.
@@ -2504,7 +2498,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_FPR_WITHOUT_ADDR       230 // test1=formatted fingerprint
 #define         DC_QR_ACCOUNT                250 // text1=domain
 #define         DC_QR_BACKUP                 251
-#define         DC_QR_BACKUP2                252
 #define         DC_QR_WEBRTC_INSTANCE        260 // text1=domain, text2=instance pattern
 #define         DC_QR_ADDR                   320 // id=contact
 #define         DC_QR_TEXT                   330 // text1=text
@@ -2551,7 +2544,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   if so, call dc_set_config_from_qr() and then dc_configure().
  *
  * - DC_QR_BACKUP:
- * - DC_QR_BACKUP2:
  *   ask the user if they want to set up a new device.
  *   If so, pass the qr-code to dc_receive_backup().
  *
@@ -6650,16 +6642,12 @@ void dc_event_unref(dc_event_t* event);
 /// "Message opened"
 ///
 /// Used in subjects of outgoing read receipts.
-///
-/// @deprecated Deprecated 2024-07-26
 #define DC_STR_READRCPT                   31
 
 /// "The message '%1$s' you sent was displayed on the screen of the recipient."
 ///
 /// Used as message text of outgoing read receipts.
 /// - %1$s will be replaced by the subject of the displayed message
-///
-/// @deprecated Deprecated 2024-06-23
 #define DC_STR_READRCPT_MAILBODY          32
 
 /// @deprecated Deprecated, this string is no longer needed.
@@ -7378,7 +7366,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used as info message.
 #define DC_STR_SECUREJOIN_WAIT_TIMEOUT 191
 
-/// "Contact". Deprecated, currently unused.
+/// "Contact"
 #define DC_STR_CONTACT 200
 
 /**

deltachat-ffi/src/lib.rs

@@ -4364,7 +4364,7 @@ pub unsafe extern "C" fn dc_backup_provider_wait(provider: *mut dc_backup_provid
     let ctx = &*ffi_provider.context;
     let provider = &mut ffi_provider.provider;
     block_on(provider)
-        .context("Failed to await backup provider")
+        .context("Failed to await BackupProvider")
         .log_err(ctx)
         .set_last_error(ctx)
         .ok();
@@ -4418,7 +4418,7 @@ trait ResultExt<T, E> {
     /// Like `log_err()`, but:
     /// - returns the default value instead of an Err value.
     /// - emits an error instead of a warning for an [Err] result. This means
-    ///   that the error will be shown to the user in a small pop-up.
+    /// that the error will be shown to the user in a small pop-up.
     fn unwrap_or_log_default(self, context: &context::Context, message: &str) -> T;
 }
 

deltachat-ffi/src/lot.rs

@@ -50,7 +50,6 @@ impl Lot {
                 Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
                 Qr::Account { domain } => Some(domain),
                 Qr::Backup { .. } => None,
-                Qr::Backup2 { .. } => None,
                 Qr::WebrtcInstance { domain, .. } => Some(domain),
                 Qr::Addr { draft, .. } => draft.as_deref(),
                 Qr::Url { url } => Some(url),
@@ -103,7 +102,6 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
                 Qr::Backup { .. } => LotState::QrBackup,
-                Qr::Backup2 { .. } => LotState::QrBackup2,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
                 Qr::Addr { .. } => LotState::QrAddr,
                 Qr::Url { .. } => LotState::QrUrl,
@@ -129,7 +127,6 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
                 Qr::Backup { .. } => Default::default(),
-                Qr::Backup2 { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
                 Qr::Addr { contact_id, .. } => contact_id.to_u32(),
                 Qr::Url { .. } => Default::default(),
@@ -180,8 +177,6 @@ pub enum LotState {
 
     QrBackup = 251,
 
-    QrBackup2 = 252,
-
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.142.1"
+version = "1.140.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -13,30 +13,30 @@ path = "src/webserver.rs"
 required-features = ["webserver"]
 
 [dependencies]
-anyhow = { workspace = true }
+anyhow = "1"
 deltachat = { path = ".." }
 deltachat-contact-tools = { path = "../deltachat-contact-tools" }
-num-traits = { workspace = true }
-schemars = "0.8.21"
-serde = { workspace = true, features = ["derive"] }
-tempfile = { workspace = true }
-log = { workspace = true }
-async-channel = { workspace = true }
-futures = { workspace = true }
-serde_json = { workspace = true }
-yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
+num-traits = "0.2"
+schemars = "0.8.19"
+serde = { version = "1.0", features = ["derive"] }
+tempfile = "3.10.1"
+log = "0.4"
+async-channel = { version = "2.2.1" }
+futures = { version = "0.3.30" }
+serde_json = "1"
+yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.8", features = ["json_value"] }
-tokio = { workspace = true }
-sanitize-filename = { workspace = true }
+tokio = { version = "1.37.0" }
+sanitize-filename = "0.5"
 walkdir = "2.5.0"
-base64 = { workspace = true }
+base64 = "0.22"
 
 # optional dependencies
 axum = { version = "0.7", optional = true, features = ["ws"] }
 env_logger = { version = "0.11.3", optional = true }
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.37.0", features = ["full", "rt-multi-thread"] }
 
 
 [features]

deltachat-jsonrpc/src/api.rs

@@ -707,22 +707,7 @@ impl CommandApi {
         ChatId::new(chat_id).get_encryption_info(&ctx).await
     }
 
-    /// Get QR code text that will offer a [SecureJoin](https://securejoin.delta.chat/) invitation.
-    ///
-    /// If `chat_id` is a group chat ID, SecureJoin QR code for the group is returned.
-    /// If `chat_id` is unset, setup contact QR code is returned.
-    async fn get_chat_securejoin_qr_code(
-        &self,
-        account_id: u32,
-        chat_id: Option<u32>,
-    ) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let chat = chat_id.map(ChatId::new);
-        let qr = securejoin::get_securejoin_qr(&ctx, chat).await?;
-        Ok(qr)
-    }
-
-    /// Get QR code (text and SVG) that will offer a Setup-Contact or Verified-Group invitation.
+    /// Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
     /// The QR code is compatible to the OPENPGP4FPR format
     /// so that a basic fingerprint comparison also works e.g. with OpenKeychain.
     ///
@@ -744,9 +729,10 @@ impl CommandApi {
     ) -> Result<(String, String)> {
         let ctx = self.get_context(account_id).await?;
         let chat = chat_id.map(ChatId::new);
-        let qr = securejoin::get_securejoin_qr(&ctx, chat).await?;
-        let svg = get_securejoin_qr_svg(&ctx, chat).await?;
-        Ok((qr, svg))
+        Ok((
+            securejoin::get_securejoin_qr(&ctx, chat).await?,
+            get_securejoin_qr_svg(&ctx, chat).await?,
+        ))
     }
 
     /// Continue a Setup-Contact or Verified-Group-Invite protocol
@@ -1490,20 +1476,6 @@ impl CommandApi {
         deltachat::contact::make_vcard(&ctx, &contacts).await
     }
 
-    /// Sets vCard containing the given contacts to the message draft.
-    async fn set_draft_vcard(
-        &self,
-        account_id: u32,
-        msg_id: u32,
-        contacts: Vec<u32>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let contacts: Vec<_> = contacts.iter().map(|&c| ContactId::new(c)).collect();
-        let mut msg = Message::load_from_db(&ctx, MsgId::new(msg_id)).await?;
-        msg.make_vcard(&ctx, &contacts).await?;
-        msg.get_chat_id().set_draft(&ctx, Some(&mut msg)).await
-    }
-
     // ---------------------------------------------
     //                   chat
     // ---------------------------------------------

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

@@ -32,7 +32,6 @@ pub struct FullChat {
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
-    pinned: bool,
     // subtitle  - will be moved to frontend because it uses translation functions
     chat_type: u32,
     is_unpromoted: bool,
@@ -105,7 +104,6 @@ impl FullChat {
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
             chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),
@@ -155,7 +153,6 @@ pub struct BasicChat {
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
-    pinned: bool,
     chat_type: u32,
     is_unpromoted: bool,
     is_self_talk: bool,
@@ -183,7 +180,6 @@ impl BasicChat {
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
             chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),

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

@@ -577,9 +577,7 @@ pub struct MessageData {
     pub file: Option<String>,
     pub location: Option<(f64, f64)>,
     pub override_sender_name: Option<String>,
-    /// Quoted message id. Takes preference over `quoted_text` (see below).
     pub quoted_message_id: Option<u32>,
-    pub quoted_text: Option<String>,
 }
 
 impl MessageData {
@@ -615,9 +613,6 @@ impl MessageData {
                     ),
                 )
                 .await?;
-        } else if let Some(text) = self.quoted_text {
-            let protect = false;
-            message.set_quote_text(Some((text, protect)));
         }
         Ok(message)
     }

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

@@ -35,11 +35,6 @@ pub enum QrObject {
     Backup {
         ticket: String,
     },
-    Backup2 {
-        auth_token: String,
-
-        node_addr: String,
-    },
     WebrtcInstance {
         domain: String,
         instance_pattern: String,
@@ -137,14 +132,6 @@ impl From<Qr> for QrObject {
             Qr::Backup { ticket } => QrObject::Backup {
                 ticket: ticket.to_string(),
             },
-            Qr::Backup2 {
-                ref node_addr,
-                auth_token,
-            } => QrObject::Backup2 {
-                node_addr: serde_json::to_string(node_addr).unwrap_or_default(),
-
-                auth_token,
-            },
             Qr::WebrtcInstance {
                 domain,
                 instance_pattern,

deltachat-jsonrpc/typescript/package.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "@deltachat/tiny-emitter": "3.0.0",
     "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.6.2"
+    "yerpc": "^0.4.3"
   },
   "devDependencies": {
     "@types/chai": "^4.2.21",
@@ -58,5 +58,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.142.1"
+  "version": "1.140.0"
 }

deltachat-repl/Cargo.toml

@@ -1,20 +1,20 @@
 [package]
 name = "deltachat-repl"
-version = "1.142.1"
+version = "1.140.0"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [dependencies]
-ansi_term = { workspace = true }
-anyhow = { workspace = true }
+ansi_term = "0.12.1"
+anyhow = "1"
 deltachat = { path = "..", features = ["internals"]}
 dirs = "5"
-log = { workspace = true }
-rusqlite = { workspace = true }
+log = "0.4.21"
+rusqlite = "0.31"
 rustyline = "14"
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+tokio = { version = "1.37.0", features = ["fs", "rt-multi-thread", "macros"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [features]
 default = ["vendored"]

deltachat-repl/src/cmdline.rs

@@ -339,6 +339,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  receive-backup <qr>\n\
                  export-keys\n\
                  import-keys\n\
+                 export-setup\n\
                  poke [<eml-file>|<folder>|<addr> <key-file>]\n\
                  reset <flags>\n\
                  stop\n\
@@ -503,6 +504,17 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "import-keys" => {
             imex(&context, ImexMode::ImportSelfKeys, arg1.as_ref(), None).await?;
         }
+        "export-setup" => {
+            let setup_code = create_setup_code(&context);
+            let file_name = blobdir.join("autocrypt-setup-message.html");
+            let file_content = render_setup_file(&context, &setup_code).await?;
+            fs::write(&file_name, file_content).await?;
+            println!(
+                "Setup message written to: {}\nSetup code: {}",
+                file_name.display(),
+                &setup_code,
+            );
+        }
         "poke" => {
             ensure!(poke_spec(&context, Some(arg1)).await, "Poke failed");
         }

deltachat-repl/src/main.rs

@@ -152,7 +152,7 @@ impl Completer for DcHelper {
     }
 }
 
-const IMEX_COMMANDS: [&str; 13] = [
+const IMEX_COMMANDS: [&str; 14] = [
     "initiate-key-transfer",
     "get-setupcodebegin",
     "continue-key-transfer",
@@ -163,6 +163,7 @@ const IMEX_COMMANDS: [&str; 13] = [
     "receive-backup",
     "export-keys",
     "import-keys",
+    "export-setup",
     "poke",
     "reset",
     "stop",

deltachat-rpc-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.142.1"
+version = "1.140.0"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -17,6 +17,8 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Communications :: Chat",
     "Topic :: Communications :: Email"
 ]

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

@@ -250,16 +250,12 @@ class Account:
         """
         return Chat(self, self._rpc.secure_join(self.id, qrdata))
 
-    def get_qr_code(self) -> str:
-        """Get Setup-Contact QR Code text.
+    def get_qr_code(self) -> tuple[str, str]:
+        """Get Setup-Contact QR Code text and SVG data.
 
-        This data needs to be transferred to another Delta Chat account
+        this data needs to be transferred to another Delta Chat account
         in a second channel, typically used by mobiles with QRcode-show + scan UX.
         """
-        return self._rpc.get_chat_securejoin_qr_code(self.id, None)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
-        """Get Setup-Contact QR code text and SVG."""
         return self._rpc.get_chat_securejoin_qr_code_svg(self.id, None)
 
     def get_message_by_id(self, msg_id: int) -> Message:

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

@@ -96,11 +96,7 @@ class Chat:
         """Return encryption info for this chat."""
         return self._rpc.get_chat_encryption_info(self.account.id, self.id)
 
-    def get_qr_code(self) -> str:
-        """Get Join-Group QR code text."""
-        return self._rpc.get_chat_securejoin_qr_code(self.account.id, self.id)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
+    def get_qr_code(self) -> tuple[str, str]:
         """Get Join-Group QR code text and SVG data."""
         return self._rpc.get_chat_securejoin_qr_code_svg(self.account.id, self.id)
 

deltachat-rpc-client/tests/test_chatlist_events.py

@@ -210,7 +210,6 @@ def test_multidevice_sync_chat(acfactory: ACFactory) -> None:
     alice_second_device.clear_all_events()
     alice_chat_bob.pin()
     wait_for_chatlist_specific_item(alice_second_device, alice_chat_bob.id)
-    assert alice_second_device.get_chat_by_id(alice_chat_bob.id).get_basic_snapshot().pinned
 
     alice_second_device.clear_all_events()
     alice_chat_bob.mute()

deltachat-rpc-client/tests/test_iroh_webxdc.py

@@ -68,7 +68,7 @@ def wait_receive_realtime_data(msg_data_list):
         if event.kind == EventType.WEBXDC_REALTIME_DATA:
             for i, (msg, data) in enumerate(msg_data_list):
                 if msg.id == event.msg_id:
-                    assert list(data) == event.data
+                    assert data == event.data
                     log(f"msg {msg.id}: got correct realtime data {data}")
                     del msg_data_list[i]
                     break
@@ -184,26 +184,3 @@ def test_no_duplicate_messages(acfactory, path_to_webxdc):
         if event.kind == EventType.WEBXDC_REALTIME_DATA:
             assert int(bytes(event.data).decode()) > n
             break
-
-
-def test_no_reordering(acfactory, path_to_webxdc):
-    """Test that sending a lot of realtime messages does not result in reordering."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_webxdc_msg, ac2_webxdc_msg = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
-
-    setup_thread_send_realtime_data(ac1_webxdc_msg, b"hello")
-    wait_receive_realtime_data([(ac2_webxdc_msg, b"hello")])
-
-    for i in range(200):
-        ac1_webxdc_msg.send_webxdc_realtime_data([i])
-
-    for i in range(200):
-        while 1:
-            event = ac2.wait_for_event()
-            if event.kind == EventType.WEBXDC_REALTIME_DATA and bytes(event.data) != b"hello":
-                if event.data[0] == i:
-                    break
-                pytest.fail("Reordering detected")

deltachat-rpc-client/tests/test_securejoin.py

@@ -7,7 +7,7 @@ from deltachat_rpc_client import Chat, EventType, SpecialContactId
 def test_qr_setup_contact(acfactory, tmp_path) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
 
     alice.wait_for_securejoin_inviter_success()
@@ -30,35 +30,13 @@ def test_qr_setup_contact(acfactory, tmp_path) -> None:
     bob2.export_self_keys(tmp_path)
 
     logging.info("Bob imports a key")
-    bob.import_self_keys(tmp_path)
+    bob.import_self_keys(tmp_path / "private-key-default.asc")
 
     assert bob.get_config("key_id") == "2"
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert not bob_contact_alice_snapshot.is_verified
 
 
-def test_qr_setup_contact_svg(acfactory) -> None:
-    alice = acfactory.new_configured_account()
-    _, _, domain = alice.get_config("addr").rpartition("@")
-
-    _qr_code, svg = alice.get_qr_code_svg()
-
-    # Test that email address is in SVG
-    # when we have no display name.
-    # Check only the domain name, because
-    # long address may be split over multiple lines
-    # and not matched.
-    assert domain in svg
-
-    alice.set_config("displayname", "Alice")
-
-    # Test that display name is used
-    # in SVG and no address is visible.
-    _qr_code, svg = alice.get_qr_code_svg()
-    assert domain not in svg
-    assert "Alice" in svg
-
-
 @pytest.mark.parametrize("protect", [True, False])
 def test_qr_securejoin(acfactory, protect):
     alice, bob = acfactory.get_online_accounts(2)
@@ -68,7 +46,7 @@ def test_qr_securejoin(acfactory, protect):
     assert alice_chat.get_basic_snapshot().is_protected == protect
 
     logging.info("Bob joins verified group")
-    qr_code = alice_chat.get_qr_code()
+    qr_code, _svg = alice_chat.get_qr_code()
     bob.secure_join(qr_code)
 
     # Check that at least some of the handshake messages are deleted.
@@ -113,7 +91,7 @@ def test_qr_securejoin_contact_request(acfactory) -> None:
 
     alice_chat = alice.create_group("Verified group", protect=True)
     logging.info("Bob joins verified group")
-    qr_code = alice_chat.get_qr_code()
+    qr_code, _svg = alice_chat.get_qr_code()
     bob.secure_join(qr_code)
     while True:
         event = bob.wait_for_event()
@@ -128,7 +106,7 @@ def test_qr_readreceipt(acfactory) -> None:
     alice, bob, charlie = acfactory.get_online_accounts(3)
 
     logging.info("Bob and Charlie setup contact with Alice")
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
 
     bob.secure_join(qr_code)
     charlie.secure_join(qr_code)
@@ -190,13 +168,13 @@ def test_setup_contact_resetup(acfactory) -> None:
     """Tests that setup contact works after Alice resets the device and changes the key."""
     alice, bob = acfactory.get_online_accounts(2)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
     alice = acfactory.resetup_account(alice)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
@@ -210,7 +188,7 @@ def test_verified_group_recovery(acfactory) -> None:
     assert chat.get_basic_snapshot().is_protected
 
     logging.info("ac2 joins verified group")
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -227,7 +205,7 @@ def test_verified_group_recovery(acfactory) -> None:
     ac2 = acfactory.resetup_account(ac2)
 
     logging.info("ac2 reverifies with ac3")
-    qr_code = ac3.get_qr_code()
+    qr_code, _svg = ac3.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -274,7 +252,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     assert chat.get_basic_snapshot().is_protected
 
     logging.info("ac2 joins verified group")
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -291,7 +269,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     ac2 = acfactory.resetup_account(ac2)
 
     logging.info("ac2 reverifies with ac3")
-    qr_code = ac3.get_qr_code()
+    qr_code, _svg = ac3.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -358,7 +336,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
     ac1, ac2, ac3, ac4 = acfactory.get_online_accounts(4)
 
     logging.info("ac3: verify with ac2")
-    qr_code = ac2.get_qr_code()
+    qr_code, _svg = ac2.get_qr_code()
     ac3.secure_join(qr_code)
     ac2.wait_for_securejoin_inviter_success()
 
@@ -368,7 +346,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
 
     logging.info("ac1: create verified group that ac2 fully joins")
     ch1 = ac1.create_group("Group", protect=True)
-    qr_code = ch1.get_qr_code()
+    qr_code, _svg = ch1.get_qr_code()
     ac2.secure_join(qr_code)
     ac1.wait_for_securejoin_inviter_success()
 
@@ -381,7 +359,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
             break
 
     logging.info("ac1: let ac2 join again but shutoff ac1 in the middle of securejoin")
-    qr_code = ch1.get_qr_code()
+    qr_code, _svg = ch1.get_qr_code()
     ac2.secure_join(qr_code)
     ac1.remove()
     logging.info("ac2 now has pending bobstate but ac1 is shutoff")
@@ -403,7 +381,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
             break
 
     logging.info("ac3: create a join-code for group VG and let ac4 join, check that ac2 got it")
-    qr_code = vg.get_qr_code()
+    qr_code, _svg = vg.get_qr_code()
     ac4.secure_join(qr_code)
     ac3.wait_for_securejoin_inviter_success()
     while 1:
@@ -424,7 +402,7 @@ def test_qr_new_group_unblocked(acfactory):
 
     ac1, ac2 = acfactory.get_online_accounts(2)
     ac1_chat = ac1.create_group("Group for joining", protect=True)
-    qr_code = ac1_chat.get_qr_code()
+    qr_code, _svg = ac1_chat.get_qr_code()
     ac2.secure_join(qr_code)
 
     ac1.wait_for_securejoin_inviter_success()
@@ -447,7 +425,7 @@ def test_aeap_flow_verified(acfactory):
     logging.info("ac1: create verified-group QR, ac2 scans and joins")
     chat = ac1.create_group("hello", protect=True)
     assert chat.get_basic_snapshot().is_protected
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     logging.info("ac2: start QR-code based join-group protocol")
     ac2.secure_join(qr_code)
     ac1.wait_for_securejoin_inviter_success()
@@ -486,12 +464,12 @@ def test_gossip_verification(acfactory) -> None:
     alice, bob, carol = acfactory.get_online_accounts(3)
 
     # Bob verifies Alice.
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
     # Bob verifies Carol.
-    qr_code = carol.get_qr_code()
+    qr_code, _svg = carol.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
@@ -542,16 +520,16 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
     ac3_chat = ac3.create_group("Verified group", protect=True)
 
     # ac1 joins ac3 group.
-    ac3_qr_code = ac3_chat.get_qr_code()
+    ac3_qr_code, _svg = ac3_chat.get_qr_code()
     ac1.secure_join(ac3_qr_code)
     ac1.wait_for_securejoin_joiner_success()
 
     # ac1 waits for member added message and creates a QR code.
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    ac1_qr_code = snapshot.chat.get_qr_code()
+    ac1_qr_code, _svg = snapshot.chat.get_qr_code()
 
     # ac2 verifies ac1
-    qr_code = ac1.get_qr_code()
+    qr_code, _svg = ac1.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -611,7 +589,7 @@ def test_withdraw_securejoin_qr(acfactory):
     assert alice_chat.get_basic_snapshot().is_protected
     logging.info("Bob joins verified group")
 
-    qr_code = alice_chat.get_qr_code()
+    qr_code, _svg = alice_chat.get_qr_code()
     bob_chat = bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 

deltachat-rpc-client/tests/test_something.py

@@ -1,4 +1,3 @@
-import base64
 import concurrent.futures
 import json
 import logging
@@ -104,12 +103,12 @@ def test_account(acfactory) -> None:
     assert alice.get_chatlist(snapshot=True)
     assert alice.get_qr_code()
     assert alice.get_fresh_messages()
+    assert alice.get_next_messages()
 
     # Test sending empty message.
     assert len(bob.wait_next_messages()) == 0
     alice_chat_bob.send_text("")
     messages = bob.wait_next_messages()
-    assert bob.get_next_messages() == messages
     assert len(messages) == 1
     message = messages[0]
     snapshot = message.get_snapshot()
@@ -614,10 +613,3 @@ def test_markseen_contact_request(acfactory, tmp_path):
         if event.kind == EventType.MSGS_NOTICED:
             break
     assert message2.get_snapshot().state == MessageState.IN_SEEN
-
-
-def test_get_http_response(acfactory):
-    alice = acfactory.new_configured_account()
-    http_response = alice._rpc.get_http_response(alice.id, "https://example.org")
-    assert http_response["mimetype"] == "text/html"
-    assert b"<title>Example Domain</title>" in base64.b64decode((http_response["blob"] + "==").encode())

deltachat-rpc-client/tox.ini

@@ -28,5 +28,5 @@ commands =
 
 [pytest]
 timeout = 300
-log_cli = true
+#log_cli = true
 log_level = debug

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.142.1"
+version = "1.140.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -13,15 +13,15 @@ categories = ["cryptography", "std", "email"]
 deltachat-jsonrpc = { path = "../deltachat-jsonrpc", default-features = false }
 deltachat = { path = "..", default-features = false }
 
-anyhow = { workspace = true }
-futures-lite = { workspace = true }
-log = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
-tokio = { workspace = true, features = ["io-std"] }
-tokio-util = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
-yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
+anyhow = "1"
+futures-lite = "2.3.0"
+log = "0.4"
+serde_json = "1"
+serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.37.0", features = ["io-std"] }
+tokio-util = "0.7.9"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
 
 [features]
 default = ["vendored"]

deltachat-rpc-server/npm-package/README.md

@@ -7,7 +7,7 @@ This simplifies cross-compilation and even reduces binary size (no CFFI layer an
 
 ## Usage
 
-> The **minimum** nodejs version for this package is `16`
+> The **minimum** nodejs version for this package is `20.11`
 
 ```
 npm i @deltachat/stdio-rpc-server @deltachat/jsonrpc-client

deltachat-rpc-server/npm-package/index.js

@@ -11,6 +11,9 @@ import {
   NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR,
 } from "./src/errors.js";
 
+// Because this is not compiled by typescript, esm needs this stuff (` with { type: "json" };`,
+// nodejs still complains about it being experimental, but deno also uses it, so treefit bets taht it will become standard)
+import package_json from "./package.json" with { type: "json" };
 import { createRequire } from "node:module";
 
 function findRPCServerInNodeModules() {
@@ -22,12 +25,7 @@ function findRPCServerInNodeModules() {
     return resolve(package_name);
   } catch (error) {
     console.debug("findRpcServerInNodeModules", error);
-    const require = createRequire(import.meta.url);
-    if (
-      Object.keys(require("./package.json").optionalDependencies).includes(
-        package_name
-      )
-    ) {
+    if (Object.keys(package_json.optionalDependencies).includes(package_name)) {
       throw new Error(NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name));
     } else {
       throw new Error(NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR());

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

@@ -15,5 +15,5 @@
   },
   "type": "module",
   "types": "index.d.ts",
-  "version": "1.142.1"
+  "version": "1.140.0"
 }

deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js

@@ -55,10 +55,9 @@ for (const { folder_name, package_name } of platform_package_names) {
 }
 
 if (is_local) {
-  package_json.peerDependencies["@deltachat/jsonrpc-client"] =
-    `file:${join(expected_cwd, "/../../deltachat-jsonrpc/typescript")}`;
+  package_json.peerDependencies["@deltachat/jsonrpc-client"] = 'file:../../deltachat-jsonrpc/typescript'
 } else {
-  package_json.peerDependencies["@deltachat/jsonrpc-client"] = "*";
+  package_json.peerDependencies["@deltachat/jsonrpc-client"] = "*"
 }
 
 await fs.writeFile("./package.json", JSON.stringify(package_json, null, 4));

deny.toml

@@ -15,10 +15,6 @@ ignore = [
 
     # Unmaintained encoding
     "RUSTSEC-2021-0153",
-
-    # Problem in curve25519-dalek 3.2.0 used by iroh 0.4.
-    # curve25519-dalek 4.1.3 has the problem fixed.
-    "RUSTSEC-2024-0344",
 ]
 
 [bans]
@@ -54,7 +50,6 @@ skip = [
      { name = "fastrand", version = "1.9.0" },
      { name = "futures-lite", version = "1.13.0" },
      { name = "getrandom", version = "<0.2" },
-     { name = "h2", version = "0.3.26" },
      { name = "http-body", version = "0.4.6" },
      { name = "http", version = "0.2.12" },
      { name = "hyper-rustls", version = "0.24.2" },
@@ -87,7 +82,6 @@ skip = [
      { name = "spki", version = "0.6.0" },
      { name = "ssh-encoding", version = "0.1.0" },
      { name = "ssh-key", version = "0.5.1" },
-     { name = "strsim", version = "0.10.0" },
      { name = "sync_wrapper", version = "0.1.2" },
      { name = "synstructure", version = "0.12.6" },
      { name = "syn", version = "1.0.109" },

node/constants.js

@@ -128,7 +128,6 @@ module.exports = {
   DC_QR_ASK_VERIFYCONTACT: 200,
   DC_QR_ASK_VERIFYGROUP: 202,
   DC_QR_BACKUP: 251,
-  DC_QR_BACKUP2: 252,
   DC_QR_ERROR: 400,
   DC_QR_FPR_MISMATCH: 220,
   DC_QR_FPR_OK: 210,

node/lib/constants.ts

@@ -128,7 +128,6 @@ export enum C {
   DC_QR_ASK_VERIFYCONTACT = 200,
   DC_QR_ASK_VERIFYGROUP = 202,
   DC_QR_BACKUP = 251,
-  DC_QR_BACKUP2 = 252,
   DC_QR_ERROR = 400,
   DC_QR_FPR_MISMATCH = 220,
   DC_QR_FPR_OK = 210,

package.json

@@ -11,7 +11,7 @@
     "chai": "~4.3.10",
     "chai-as-promised": "^7.1.1",
     "mocha": "^8.2.1",
-    "node-gyp": "~10.1.0",
+    "node-gyp": "^10.0.0",
     "prebuildify": "^5.0.1",
     "prebuildify-ci": "^1.0.5",
     "prettier": "^3.0.3",
@@ -55,5 +55,5 @@
     "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.142.1"
+  "version": "1.140.0"
 }

python/examples/test_examples.py

@@ -44,6 +44,11 @@ def test_group_tracking_plugin(acfactory, lp):
 
     ac1, ac2 = acfactory.get_online_accounts(2)
 
+    botproc.fnmatch_lines(
+        """
+        *ac_configure_completed*
+    """,
+    )
     ac1.add_account_plugin(FFIEventLogger(ac1))
     ac2.add_account_plugin(FFIEventLogger(ac2))
 

python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat"
-version = "1.142.1"
+version = "1.140.0"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"

python/src/deltachat/testplugin.py

@@ -552,15 +552,6 @@ class ACFactory:
 
         bot_cfg = self.get_next_liveconfig()
         bot_ac = self.prepare_account_from_liveconfig(bot_cfg)
-        self._acsetup.start_configure(bot_ac)
-        self.wait_configured(bot_ac)
-        bot_ac.start_io()
-        # Wait for DC_EVENT_IMAP_INBOX_IDLE so that all emails appeared in the bot's Inbox later are
-        # considered new and not existing ones, and thus processed by the bot.
-        print(bot_ac._logid, "waiting for inbox IDLE to become ready")
-        bot_ac._evtracker.wait_idle_inbox_ready()
-        bot_ac.stop_io()
-        self._acsetup._account2state[bot_ac] = self._acsetup.IDLEREADY
 
         # Forget ac as it will be opened by the bot subprocess
         # but keep something in the list to not confuse account generation

python/tests/test_0_complex_or_slow.py

@@ -1,5 +1,4 @@
 import sys
-import time
 
 import pytest
 import deltachat as dc
@@ -676,17 +675,3 @@ def test_verified_group_vs_delete_server_after(acfactory, tmp_path, lp):
     assert msg_in.chat == chat2_offl
     assert msg_in.get_sender_contact().addr == ac2.get_config("addr")
     assert ac2_offl_ac1_contact.is_verified()
-
-
-def test_deleted_msgs_dont_reappear(acfactory):
-    ac1 = acfactory.new_online_configuring_account()
-    acfactory.bring_accounts_online()
-    ac1.set_config("bcc_self", "1")
-    chat = ac1.get_self_contact().create_chat()
-    msg = chat.send_text("hello")
-    ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-    ac1.delete_messages([msg])
-    ac1._evtracker.get_matching("DC_EVENT_MSG_DELETED")
-    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
-    time.sleep(5)
-    assert len(chat.get_messages()) == 0

python/tests/test_1_online.py

@@ -1562,6 +1562,8 @@ def test_import_export_online_all(acfactory, tmp_path, data, lp):
 
         # check progress events for import
         assert imex_tracker.wait_progress(1, progress_upper_limit=249)
+        assert imex_tracker.wait_progress(500, progress_upper_limit=749)
+        assert imex_tracker.wait_progress(750, progress_upper_limit=999)
         assert imex_tracker.wait_progress(1000)
 
     assert_account_is_proper(ac1)

release-date.in

@@ -1 +1 @@
-2024-07-30
+2024-06-04

scripts/coredeps/install-rust.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.80.0
+RUST_VERSION=1.78.0
 
 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu

scripts/create-provider-data-rs.py

@@ -149,7 +149,7 @@ def process_data(data, file):
     oauth2 = "Some(Oauth2Authorizer::" + camel(oauth2) + ")" if oauth2 != "" else "None"
 
     provider = ""
-    before_login_hint = cleanstr(data.get("before_login_hint", "") or "")
+    before_login_hint = cleanstr(data.get("before_login_hint", ""))
     after_login_hint = cleanstr(data.get("after_login_hint", ""))
     if (not has_imap and not has_smtp) or (has_imap and has_smtp):
         provider += (

scripts/run_all.sh

@@ -31,6 +31,6 @@ unset CHATMAIL_DOMAIN
 
 # Try to build wheels for a range of interpreters, but don't fail if they are not available.
 # E.g. musllinux_1_1 does not have PyPy interpreters as of 2022-07-10
-tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,py312,pypy37,pypy38,pypy39,pypy310 --skip-missing-interpreters true
+tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,py312,py313,pypy37,pypy38,pypy39,pypy310 --skip-missing-interpreters true
 
 auditwheel repair "$TOXWORKDIR"/wheelhouse/deltachat* -w "$TOXWORKDIR/wheelhouse"

scripts/update-provider-database.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 export TZ=UTC
 
 # Provider database revision.
-REV=828e5ddc7e6609b582fbd7f063cc3f60b580ce96
+REV=2f3db24107e4802c2df0aa0a40f0e144006c0a9b
 
 CORE_ROOT="$PWD"
 TMP="$(mktemp -d)"

spec.md

@@ -1,6 +1,6 @@
 # chat-mail specification
 
-Version: 0.35.0
+Version: 0.34.0
 Status:  In-progress 
 Format:  [Semantic Line Breaks](https://sembr.org/)
 
@@ -22,13 +22,7 @@ to implement typical messenger functions.
 - [Locations](#locations)
     - [User locations](#user-locations)
     - [Points of interest](#points-of-interest)
-- [Stickers](#stickers)
-- [Voice messages](#voice-messages)
-- [Reactions](#reactions)
-- [Attaching a contact to a message](#attaching-a-contact-to-a-message)
-- [Transitioning to a new e-mail address (AEAP)](#transitioning-to-a-new-e-mail-address-aeap)
 - [Miscellaneous](#miscellaneous)
-    - [Sync messages](#sync-messages)
 
 
 # Encryption
@@ -467,58 +461,6 @@ As an extension to RFC 9078, it is allowed to send empty reaction message,
 in which case all previously sent reactions are retracted.
 
 
-# Attaching a contact to a message
-
-Messengers MAY allow the user to attach a contact to a message
-in order to share it with the chat partner.
-The contact MUST be sent as a [vCard](https://datatracker.ietf.org/doc/html/rfc6350).
-
-The vCard MUST contain `EMAIL`,
-`FN` (display name),
-and `VERSION` (which version of the vCard standard you're using).
-If available, it SHOULD contain
-`REV` (current timestamp),
-`PHOTO` (avatar), and
-`KEY` (OpenPGP public key,
-in binary format,
-encoded with vanilla base64;
-note that this is different from the OpenPGP 'ASCII Armor' format).
-
-Example vCard:
-
-```
-BEGIN:VCARD
-VERSION:4.0
-EMAIL:alice@example.org
-FN:Alice Wonderland
-KEY:data:application/pgp-keys;base64,[Base64-data]
-PHOTO:data:image/jpeg;base64,[image in Base64]
-REV:20240418T184242Z
-END:VCARD
-```
-
-It is fine if messengers do include a full vCard parser
-and e.g. simply search for the line starting with `EMAIL`
-in order to get the email address.
-
-
-# Transitioning to a new e-mail address (AEAP)
-
-When receiving a message:
-- If the key exists, but belongs to another address
-- AND there is a `Chat-Version` header
-- AND the message is signed correctly
-- AND the From address is (also) in the encrypted (and therefore signed) headers 
-- AND the message timestamp is newer than the contact's `lastseen`
-  (to prevent changing the address back when messages arrive out of order)
-  (this condition is not that important
-  since we will have eventual consistency even without it):
-
-  Replace the contact in _all_ groups,
-  possibly deduplicate the members list,
-  and add a system message to all of these chats.
-
-
 # Miscellaneous
 
 Messengers SHOULD use the header `In-Reply-To` as usual.
@@ -542,4 +484,21 @@ We define the effective date of a message
 as the sending time of the message as indicated by its Date header,
 or the time of first receipt if that date is in the future or unavailable.
 
+
+# Transitioning to a new e-mail address (AEAP)
+
+When receiving a message:
+- If the key exists, but belongs to another address
+- AND there is a `Chat-Version` header
+- AND the message is signed correctly
+- AND the From address is (also) in the encrypted (and therefore signed) headers 
+- AND the message timestamp is newer than the contact's `lastseen`
+  (to prevent changing the address back when messages arrive out of order)
+  (this condition is not that important
+  since we will have eventual consistency even without it):
+
+  Replace the contact in _all_ groups,
+  possibly deduplicate the members list,
+  and add a system message to all of these chats.
+
 Copyright © 2017-2021 Delta Chat contributors.

src/accounts.rs

@@ -166,14 +166,6 @@ impl Accounts {
             .remove(&id)
             .with_context(|| format!("no account with id {id}"))?;
         ctx.stop_io().await;
-
-        // Explicitly close the database.
-        //
-        // Stopping I/O aborts the tasks that keep `Context` clones,
-        // but aborting the task does not immediately drops the future.
-        // To make sure the database file is closed
-        // and can be removed on Windows, we drop all the connections manually.
-        ctx.sql.close().await;
         drop(ctx);
 
         if let Some(cfg) = self.config.get_account(id) {

src/blob.rs

@@ -12,7 +12,7 @@ use anyhow::{format_err, Context as _, Result};
 use base64::Engine as _;
 use futures::StreamExt;
 use image::codecs::jpeg::JpegEncoder;
-use image::ImageReader;
+use image::io::Reader as ImageReader;
 use image::{DynamicImage, GenericImage, GenericImageView, ImageFormat, Pixel, Rgba};
 use num_traits::FromPrimitive;
 use tokio::io::AsyncWriteExt;
@@ -1101,34 +1101,32 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_recode_image_1() {
         let bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "0",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("0"),
             bytes,
-            extension: "jpg",
-            has_exif: true,
-            original_width: 1000,
-            original_height: 1000,
-            compressed_width: 1000,
-            compressed_height: 1000,
-            ..Default::default()
-        }
-        .test()
+            "jpg",
+            true, // has Exif
+            1000,
+            1000,
+            0,
+            1000,
+            1000,
+        )
         .await
         .unwrap();
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "1",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("1"),
             bytes,
-            extension: "jpg",
-            has_exif: true,
-            original_width: 1000,
-            original_height: 1000,
-            compressed_width: 1000,
-            compressed_height: 1000,
-            ..Default::default()
-        }
-        .test()
+            "jpg",
+            true, // has Exif
+            1000,
+            1000,
+            0,
+            1000,
+            1000,
+        )
         .await
         .unwrap();
     }
@@ -1137,20 +1135,18 @@ mod tests {
     async fn test_recode_image_2() {
         // The "-rotated" files are rotated by 270 degrees using the Exif metadata
         let bytes = include_bytes!("../test-data/image/rectangle2000x1800-rotated.jpg");
-        let img_rotated = SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "0",
+        let img_rotated = send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("0"),
             bytes,
-            extension: "jpg",
-            has_exif: true,
-            original_width: 2000,
-            original_height: 1800,
-            orientation: 270,
-            compressed_width: 1800,
-            compressed_height: 2000,
-            ..Default::default()
-        }
-        .test()
+            "jpg",
+            true, // has Exif
+            2000,
+            1800,
+            270,
+            1800,
+            2000,
+        )
         .await
         .unwrap();
         assert_correct_rotation(&img_rotated);
@@ -1159,18 +1155,18 @@ mod tests {
         img_rotated.write_to(&mut buf, ImageFormat::Jpeg).unwrap();
         let bytes = buf.into_inner();
 
-        let img_rotated = SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "1",
-            bytes: &bytes,
-            extension: "jpg",
-            original_width: 1800,
-            original_height: 2000,
-            compressed_width: 1800,
-            compressed_height: 2000,
-            ..Default::default()
-        }
-        .test()
+        let img_rotated = send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("1"),
+            &bytes,
+            "jpg",
+            false, // no Exif
+            1800,
+            2000,
+            0,
+            1800,
+            2000,
+        )
         .await
         .unwrap();
         assert_correct_rotation(&img_rotated);
@@ -1180,80 +1176,64 @@ mod tests {
     async fn test_recode_image_balanced_png() {
         let bytes = include_bytes!("../test-data/image/screenshot.png");
 
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "0",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("0"),
             bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: 1920,
-            compressed_height: 1080,
-            ..Default::default()
-        }
-        .test()
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            1920,
+            1080,
+        )
         .await
         .unwrap();
 
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "1",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("1"),
             bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: constants::WORSE_IMAGE_SIZE,
-            compressed_height: constants::WORSE_IMAGE_SIZE * 1080 / 1920,
-            ..Default::default()
-        }
-        .test()
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            constants::WORSE_IMAGE_SIZE,
+            constants::WORSE_IMAGE_SIZE * 1080 / 1920,
+        )
         .await
         .unwrap();
 
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::File,
-            media_quality_config: "1",
+        send_image_check_mediaquality(
+            Viewtype::File,
+            Some("1"),
             bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: 1920,
-            compressed_height: 1080,
-            ..Default::default()
-        }
-        .test()
-        .await
-        .unwrap();
-
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::File,
-            media_quality_config: "1",
-            bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: 1920,
-            compressed_height: 1080,
-            set_draft: true,
-            ..Default::default()
-        }
-        .test()
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            1920,
+            1080,
+        )
         .await
         .unwrap();
 
         // This will be sent as Image, see [`BlobObject::maybe_sticker`] for explanation.
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Sticker,
-            media_quality_config: "0",
+        send_image_check_mediaquality(
+            Viewtype::Sticker,
+            Some("0"),
             bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: 1920,
-            compressed_height: 1080,
-            ..Default::default()
-        }
-        .test()
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            1920,
+            1080,
+        )
         .await
         .unwrap();
     }
@@ -1264,18 +1244,18 @@ mod tests {
     async fn test_recode_image_rgba_png_to_jpeg() {
         let bytes = include_bytes!("../test-data/image/screenshot-rgba.png");
 
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "1",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("1"),
             bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: constants::WORSE_IMAGE_SIZE,
-            compressed_height: constants::WORSE_IMAGE_SIZE * 1080 / 1920,
-            ..Default::default()
-        }
-        .test()
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            constants::WORSE_IMAGE_SIZE,
+            constants::WORSE_IMAGE_SIZE * 1080 / 1920,
+        )
         .await
         .unwrap();
     }
@@ -1283,19 +1263,18 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_recode_image_huge_jpg() {
         let bytes = include_bytes!("../test-data/image/screenshot.jpg");
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "0",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("0"),
             bytes,
-            extension: "jpg",
-            has_exif: true,
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: constants::BALANCED_IMAGE_SIZE,
-            compressed_height: constants::BALANCED_IMAGE_SIZE * 1080 / 1920,
-            ..Default::default()
-        }
-        .test()
+            "jpg",
+            true, // has Exif
+            1920,
+            1080,
+            0,
+            constants::BALANCED_IMAGE_SIZE,
+            constants::BALANCED_IMAGE_SIZE * 1080 / 1920,
+        )
         .await
         .unwrap();
     }
@@ -1317,93 +1296,71 @@ mod tests {
         assert_eq!(luma, 0);
     }
 
-    #[derive(Default)]
-    struct SendImageCheckMediaquality<'a> {
-        pub(crate) viewtype: Viewtype,
-        pub(crate) media_quality_config: &'a str,
-        pub(crate) bytes: &'a [u8],
-        pub(crate) extension: &'a str,
-        pub(crate) has_exif: bool,
-        pub(crate) original_width: u32,
-        pub(crate) original_height: u32,
-        pub(crate) orientation: i32,
-        pub(crate) compressed_width: u32,
-        pub(crate) compressed_height: u32,
-        pub(crate) set_draft: bool,
-    }
+    #[allow(clippy::too_many_arguments)]
+    async fn send_image_check_mediaquality(
+        viewtype: Viewtype,
+        media_quality_config: Option<&str>,
+        bytes: &[u8],
+        extension: &str,
+        has_exif: bool,
+        original_width: u32,
+        original_height: u32,
+        orientation: i32,
+        compressed_width: u32,
+        compressed_height: u32,
+    ) -> anyhow::Result<DynamicImage> {
+        let alice = TestContext::new_alice().await;
+        let bob = TestContext::new_bob().await;
+        alice
+            .set_config(Config::MediaQuality, media_quality_config)
+            .await?;
+        let file = alice.get_blobdir().join("file").with_extension(extension);
 
-    impl SendImageCheckMediaquality<'_> {
-        pub(crate) async fn test(self) -> anyhow::Result<DynamicImage> {
-            let viewtype = self.viewtype;
-            let media_quality_config = self.media_quality_config;
-            let bytes = self.bytes;
-            let extension = self.extension;
-            let has_exif = self.has_exif;
-            let original_width = self.original_width;
-            let original_height = self.original_height;
-            let orientation = self.orientation;
-            let compressed_width = self.compressed_width;
-            let compressed_height = self.compressed_height;
-            let set_draft = self.set_draft;
+        fs::write(&file, &bytes)
+            .await
+            .context("failed to write file")?;
+        check_image_size(&file, original_width, original_height);
 
-            let alice = TestContext::new_alice().await;
-            let bob = TestContext::new_bob().await;
-            alice
-                .set_config(Config::MediaQuality, Some(media_quality_config))
-                .await?;
-            let file = alice.get_blobdir().join("file").with_extension(extension);
-
-            fs::write(&file, &bytes)
-                .await
-                .context("failed to write file")?;
-            check_image_size(&file, original_width, original_height);
-
-            let (_, exif) = image_metadata(&std::fs::File::open(&file)?)?;
-            if has_exif {
-                let exif = exif.unwrap();
-                assert_eq!(exif_orientation(&exif, &alice), orientation);
-            } else {
-                assert!(exif.is_none());
-            }
-
-            let mut msg = Message::new(viewtype);
-            msg.set_file(file.to_str().unwrap(), None);
-            let chat = alice.create_chat(&bob).await;
-            if set_draft {
-                chat.id.set_draft(&alice, Some(&mut msg)).await.unwrap();
-                msg = chat.id.get_draft(&alice).await.unwrap().unwrap();
-                assert_eq!(msg.get_viewtype(), Viewtype::File);
-            }
-            let sent = alice.send_msg(chat.id, &mut msg).await;
-            let alice_msg = alice.get_last_msg().await;
-            assert_eq!(alice_msg.get_width() as u32, compressed_width);
-            assert_eq!(alice_msg.get_height() as u32, compressed_height);
-            let file_saved = alice
-                .get_blobdir()
-                .join("saved-".to_string() + &alice_msg.get_filename().unwrap());
-            alice_msg.save_file(&alice, &file_saved).await?;
-            check_image_size(file_saved, compressed_width, compressed_height);
-
-            let bob_msg = bob.recv_msg(&sent).await;
-            assert_eq!(bob_msg.get_viewtype(), Viewtype::Image);
-            assert_eq!(bob_msg.get_width() as u32, compressed_width);
-            assert_eq!(bob_msg.get_height() as u32, compressed_height);
-            let file_saved = bob
-                .get_blobdir()
-                .join("saved-".to_string() + &bob_msg.get_filename().unwrap());
-            bob_msg.save_file(&bob, &file_saved).await?;
-            if viewtype == Viewtype::File {
-                assert_eq!(file_saved.extension().unwrap(), extension);
-                let bytes1 = fs::read(&file_saved).await?;
-                assert_eq!(&bytes1, bytes);
-            }
-
-            let (_, exif) = image_metadata(&std::fs::File::open(&file_saved)?)?;
+        let (_, exif) = image_metadata(&std::fs::File::open(&file)?)?;
+        if has_exif {
+            let exif = exif.unwrap();
+            assert_eq!(exif_orientation(&exif, &alice), orientation);
+        } else {
             assert!(exif.is_none());
-
-            let img = check_image_size(file_saved, compressed_width, compressed_height);
-            Ok(img)
         }
+
+        let mut msg = Message::new(viewtype);
+        msg.set_file(file.to_str().unwrap(), None);
+        let chat = alice.create_chat(&bob).await;
+        let sent = alice.send_msg(chat.id, &mut msg).await;
+        let alice_msg = alice.get_last_msg().await;
+        assert_eq!(alice_msg.get_width() as u32, compressed_width);
+        assert_eq!(alice_msg.get_height() as u32, compressed_height);
+        let file_saved = alice
+            .get_blobdir()
+            .join("saved-".to_string() + &alice_msg.get_filename().unwrap());
+        alice_msg.save_file(&alice, &file_saved).await?;
+        check_image_size(file_saved, compressed_width, compressed_height);
+
+        let bob_msg = bob.recv_msg(&sent).await;
+        assert_eq!(bob_msg.get_viewtype(), Viewtype::Image);
+        assert_eq!(bob_msg.get_width() as u32, compressed_width);
+        assert_eq!(bob_msg.get_height() as u32, compressed_height);
+        let file_saved = bob
+            .get_blobdir()
+            .join("saved-".to_string() + &bob_msg.get_filename().unwrap());
+        bob_msg.save_file(&bob, &file_saved).await?;
+        if viewtype == Viewtype::File {
+            assert_eq!(file_saved.extension().unwrap(), extension);
+            let bytes1 = fs::read(&file_saved).await?;
+            assert_eq!(&bytes1, bytes);
+        }
+
+        let (_, exif) = image_metadata(&std::fs::File::open(&file_saved)?)?;
+        assert!(exif.is_none());
+
+        let img = check_image_size(file_saved, compressed_width, compressed_height);
+        Ok(img)
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]

src/chat.rs

@@ -8,7 +8,7 @@ use std::str::FromStr;
 use std::time::Duration;
 
 use anyhow::{anyhow, bail, ensure, Context as _, Result};
-use deltachat_contact_tools::{sanitize_bidi_characters, sanitize_single_line, ContactAddress};
+use deltachat_contact_tools::{strip_rtlo_characters, ContactAddress};
 use deltachat_derive::{FromSql, ToSql};
 use serde::{Deserialize, Serialize};
 use strum_macros::EnumIter;
@@ -46,10 +46,10 @@ use crate::stock_str;
 use crate::sync::{self, Sync::*, SyncData};
 use crate::tools::{
     buf_compress, create_id, create_outgoing_rfc724_mid, create_smeared_timestamp,
-    create_smeared_timestamps, get_abs_path, gm2local_offset, smeared_time, time, IsNoneOrEmpty,
-    SystemTime,
+    create_smeared_timestamps, get_abs_path, gm2local_offset, improve_single_line_input,
+    smeared_time, time, IsNoneOrEmpty, SystemTime,
 };
-use crate::webxdc::StatusUpdateSerial;
+use crate::webxdc::WEBXDC_SUFFIX;
 
 /// An chat item, such as a message or a marker.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -322,7 +322,7 @@ impl ChatId {
         param: Option<String>,
         timestamp: i64,
     ) -> Result<Self> {
-        let grpname = sanitize_single_line(grpname);
+        let grpname = strip_rtlo_characters(grpname);
         let timestamp = cmp::min(timestamp, smeared_time(context));
         let row_id =
             context.sql.insert(
@@ -894,20 +894,8 @@ impl ChatId {
                     .await?
                     .context("no file stored in params")?;
                 msg.param.set(Param::File, blob.as_name());
-                if msg.viewtype == Viewtype::File {
-                    if let Some((better_type, _)) =
-                        message::guess_msgtype_from_suffix(&blob.to_abs_path())
-                            // We do not do an automatic conversion to other viewtypes here so that
-                            // users can send images as "files" to preserve the original quality
-                            // (usually we compress images). The remaining conversions are done by
-                            // `prepare_msg_blob()` later.
-                            .filter(|&(vt, _)| vt == Viewtype::Webxdc || vt == Viewtype::Vcard)
-                    {
-                        msg.viewtype = better_type;
-                    }
-                }
-                if msg.viewtype == Viewtype::Vcard {
-                    msg.try_set_vcard(context, &blob.to_abs_path()).await?;
+                if blob.suffix() == Some(WEBXDC_SUFFIX) {
+                    msg.viewtype = Viewtype::Webxdc;
                 }
             }
         }
@@ -928,13 +916,12 @@ impl ChatId {
                         .sql
                         .execute(
                             "UPDATE msgs
-                            SET timestamp=?,type=?,txt=?,txt_normalized=?,param=?,mime_in_reply_to=?
+                            SET timestamp=?,type=?,txt=?, param=?,mime_in_reply_to=?
                             WHERE id=?;",
                             (
                                 time(),
                                 msg.viewtype,
                                 &msg.text,
-                                message::normalize_text(&msg.text),
                                 msg.param.to_string(),
                                 msg.in_reply_to.as_deref().unwrap_or_default(),
                                 msg.id,
@@ -958,11 +945,10 @@ impl ChatId {
                  type,
                  state,
                  txt,
-                 txt_normalized,
                  param,
                  hidden,
                  mime_in_reply_to)
-         VALUES (?,?,?,?,?,?,?,?,?,?);",
+         VALUES (?,?,?, ?,?,?,?,?,?);",
                 (
                     self,
                     ContactId::SELF,
@@ -970,7 +956,6 @@ impl ChatId {
                     msg.viewtype,
                     MessageState::OutDraft,
                     &msg.text,
-                    message::normalize_text(&msg.text),
                     msg.param.to_string(),
                     1,
                     msg.in_reply_to.as_deref().unwrap_or_default(),
@@ -1935,7 +1920,7 @@ impl Chat {
             self.param.remove(Param::Unpromoted);
             self.update_param(context).await?;
             // send_sync_msg() is called (usually) a moment later at send_msg_to_smtp()
-            // when the group creation message is actually sent through SMTP --
+            // when the group-creation message is actually sent though SMTP -
             // this makes sure, the other devices are aware of grpid that is used in the sync-message.
             context
                 .sync_qr_code_tokens(Some(self.id))
@@ -2079,7 +2064,7 @@ impl Chat {
                 .execute(
                     "UPDATE msgs
                      SET rfc724_mid=?, chat_id=?, from_id=?, to_id=?, timestamp=?, type=?,
-                         state=?, txt=?, txt_normalized=?, subject=?, param=?,
+                         state=?, txt=?, subject=?, param=?,
                          hidden=?, mime_in_reply_to=?, mime_references=?, mime_modified=?,
                          mime_headers=?, mime_compressed=1, location_id=?, ephemeral_timer=?,
                          ephemeral_timestamp=?
@@ -2093,7 +2078,6 @@ impl Chat {
                         msg.viewtype,
                         msg.state,
                         msg.text,
-                        message::normalize_text(&msg.text),
                         &msg.subject,
                         msg.param.to_string(),
                         msg.hidden,
@@ -2122,7 +2106,6 @@ impl Chat {
                         type,
                         state,
                         txt,
-                        txt_normalized,
                         subject,
                         param,
                         hidden,
@@ -2134,7 +2117,7 @@ impl Chat {
                         location_id,
                         ephemeral_timer,
                         ephemeral_timestamp)
-                        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,1,?,?,?);",
+                        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,1,?,?,?);",
                     params_slice![
                         msg.rfc724_mid,
                         msg.chat_id,
@@ -2144,7 +2127,6 @@ impl Chat {
                         msg.viewtype,
                         msg.state,
                         msg.text,
-                        message::normalize_text(&msg.text),
                         &msg.subject,
                         msg.param.to_string(),
                         msg.hidden,
@@ -2240,7 +2222,7 @@ pub(crate) async fn sync(context: &Context, id: SyncId, action: SyncAction) -> R
     context
         .add_sync_item(SyncData::AlterChat { id, action })
         .await?;
-    context.scheduler.interrupt_smtp().await;
+    context.send_sync_msg().await?;
     Ok(())
 }
 
@@ -2667,10 +2649,6 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
                 .await?;
         }
 
-        if msg.viewtype == Viewtype::Vcard {
-            msg.try_set_vcard(context, &blob.to_abs_path()).await?;
-        }
-
         let mut maybe_sticker = msg.viewtype == Viewtype::Sticker;
         if !send_as_is
             && (msg.viewtype == Viewtype::Image
@@ -2859,7 +2837,7 @@ pub async fn send_msg_sync(context: &Context, chat_id: ChatId, msg: &mut Message
 async fn send_msg_inner(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result<MsgId> {
     // protect all system messages against RTLO attacks
     if msg.is_system_message() {
-        msg.text = sanitize_bidi_characters(&msg.text);
+        msg.text = strip_rtlo_characters(&msg.text);
     }
 
     if !prepare_send_msg(context, chat_id, msg).await?.is_empty() {
@@ -2909,7 +2887,7 @@ async fn prepare_send_msg(
 /// The caller has to interrupt SMTP loop or otherwise process new rows.
 pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -> Result<Vec<i64>> {
     let needs_encryption = msg.param.get_bool(Param::GuaranteeE2ee).unwrap_or_default();
-    let mimefactory = MimeFactory::from_msg(context, msg.clone()).await?;
+    let mimefactory = MimeFactory::from_msg(context, msg).await?;
     let attach_selfavatar = mimefactory.attach_selfavatar;
     let mut recipients = mimefactory.recipients();
 
@@ -3268,25 +3246,35 @@ pub async fn marknoticed_chat(context: &Context, chat_id: ChatId) -> Result<()>
             context.emit_event(EventType::MsgsNoticed(chat_id_in_archive));
             chatlist_events::emit_chatlist_item_changed(context, chat_id_in_archive);
         }
-    } else if context
-        .sql
-        .execute(
-            "UPDATE msgs
-            SET state=?
-          WHERE state=?
-            AND hidden=0
-            AND chat_id=?;",
-            (MessageState::InNoticed, MessageState::InFresh, chat_id),
-        )
-        .await?
-        == 0
-    {
-        return Ok(());
+        chatlist_events::emit_chatlist_item_changed(context, DC_CHAT_ID_ARCHIVED_LINK);
+    } else {
+        let exists = context
+            .sql
+            .exists(
+                "SELECT COUNT(*) FROM msgs WHERE state=? AND hidden=0 AND chat_id=?;",
+                (MessageState::InFresh, chat_id),
+            )
+            .await?;
+        if !exists {
+            return Ok(());
+        }
+
+        context
+            .sql
+            .execute(
+                "UPDATE msgs
+                SET state=?
+              WHERE state=?
+                AND hidden=0
+                AND chat_id=?;",
+                (MessageState::InNoticed, MessageState::InFresh, chat_id),
+            )
+            .await?;
     }
 
     context.emit_event(EventType::MsgsNoticed(chat_id));
     chatlist_events::emit_chatlist_item_changed(context, chat_id);
-    context.on_archived_chats_maybe_noticed();
+
     Ok(())
 }
 
@@ -3349,7 +3337,6 @@ pub(crate) async fn mark_old_messages_as_noticed(
             context,
             "Marking chats as noticed because there are newer outgoing messages: {changed_chats:?}."
         );
-        context.on_archived_chats_maybe_noticed();
     }
 
     for c in changed_chats {
@@ -3495,7 +3482,7 @@ pub async fn create_group_chat(
     protect: ProtectionStatus,
     chat_name: &str,
 ) -> Result<ChatId> {
-    let chat_name = sanitize_single_line(chat_name);
+    let chat_name = improve_single_line_input(chat_name);
     ensure!(!chat_name.is_empty(), "Invalid chat name");
 
     let grpid = create_id();
@@ -3729,14 +3716,12 @@ pub(crate) async fn add_contact_to_chat_ex(
     if from_handshake && chat.param.get_int(Param::Unpromoted).unwrap_or_default() == 1 {
         chat.param.remove(Param::Unpromoted);
         chat.update_param(context).await?;
-        if context
+        let _ = context
             .sync_qr_code_tokens(Some(chat_id))
             .await
             .log_err(context)
             .is_ok()
-        {
-            context.scheduler.interrupt_smtp().await;
-        }
+            && context.send_sync_msg().await.log_err(context).is_ok();
     }
 
     if context.is_self_addr(contact.get_addr()).await? {
@@ -3775,10 +3760,7 @@ pub(crate) async fn add_contact_to_chat_ex(
         msg.param.set_cmd(SystemMessage::MemberAddedToGroup);
         msg.param.set(Param::Arg, contact_addr);
         msg.param.set_int(Param::Arg2, from_handshake.into());
-        if let Err(e) = send_msg(context, chat_id, &mut msg).await {
-            remove_from_chat_contacts_table(context, chat_id, contact_id).await?;
-            return Err(e);
-        }
+        msg.id = send_msg(context, chat_id, &mut msg).await?;
         sync = Nosync;
     }
     context.emit_event(EventType::ChatModified(chat_id));
@@ -3934,7 +3916,8 @@ pub async fn remove_contact_from_chat(
             if let Some(contact) = Contact::get_by_id_optional(context, contact_id).await? {
                 if chat.typ == Chattype::Group && chat.is_promoted() {
                     msg.viewtype = Viewtype::Text;
-                    if contact_id == ContactId::SELF {
+                    if contact.id == ContactId::SELF {
+                        set_group_explicitly_left(context, &chat.grpid).await?;
                         msg.text = stock_str::msg_group_left_local(context, ContactId::SELF).await;
                     } else {
                         msg.text = stock_str::msg_del_member_local(
@@ -3946,24 +3929,17 @@ pub async fn remove_contact_from_chat(
                     }
                     msg.param.set_cmd(SystemMessage::MemberRemovedFromGroup);
                     msg.param.set(Param::Arg, contact.get_addr().to_lowercase());
-                    let res = send_msg(context, chat_id, &mut msg).await;
-                    if contact_id == ContactId::SELF {
-                        res?;
-                        set_group_explicitly_left(context, &chat.grpid).await?;
-                    } else if let Err(e) = res {
-                        warn!(context, "remove_contact_from_chat({chat_id}, {contact_id}): send_msg() failed: {e:#}.");
-                    }
+                    msg.id = send_msg(context, chat_id, &mut msg).await?;
                 } else {
                     sync = Sync;
                 }
             }
             // we remove the member from the chat after constructing the
             // to-be-send message. If between send_msg() and here the
-            // process dies, the user will be able to redo the action. It's better than the other
-            // way round: you removed someone from DB but no peer or device gets to know about it
-            // and group membership is thus different on different devices. But if send_msg()
-            // failed, we still remove the member locally, otherwise it would be impossible to
-            // remove a member with missing key from a protected group.
+            // process dies the user will have to re-do the action.  It's
+            // better than the other way round: you removed
+            // someone from DB but no peer or device gets to know about it and
+            // group membership is thus different on different devices.
             // Note also that sending a message needs all recipients
             // in order to correctly determine encryption so if we
             // removed it first, it would complicate the
@@ -4011,7 +3987,7 @@ async fn rename_ex(
     chat_id: ChatId,
     new_name: &str,
 ) -> Result<()> {
-    let new_name = sanitize_single_line(new_name);
+    let new_name = improve_single_line_input(new_name);
     /* the function only sets the names of group chats; normal chats get their names from the contacts */
     let mut success = false;
 
@@ -4042,7 +4018,7 @@ async fn rename_ex(
             if chat.is_promoted()
                 && !chat.is_mailing_list()
                 && chat.typ != Chattype::Broadcast
-                && sanitize_single_line(&chat.name) != new_name
+                && improve_single_line_input(&chat.name) != new_name
             {
                 msg.viewtype = Viewtype::Text;
                 msg.text =
@@ -4266,39 +4242,9 @@ pub async fn resend_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
         msg.timestamp_sort = create_smeared_timestamp(context);
         // note(treefit): only matters if it is the last message in chat (but probably to expensive to check, debounce also solves it)
         chatlist_events::emit_chatlist_item_changed(context, msg.chat_id);
-        if create_send_msg_jobs(context, &mut msg).await?.is_empty() {
-            continue;
+        if !create_send_msg_jobs(context, &mut msg).await?.is_empty() {
+            context.scheduler.interrupt_smtp().await;
         }
-        if msg.viewtype == Viewtype::Webxdc {
-            let conn_fn = |conn: &mut rusqlite::Connection| {
-                let range = conn.query_row(
-                    "SELECT IFNULL(min(id), 1), IFNULL(max(id), 0) \
-                     FROM msgs_status_updates WHERE msg_id=?",
-                    (msg.id,),
-                    |row| {
-                        let min_id: StatusUpdateSerial = row.get(0)?;
-                        let max_id: StatusUpdateSerial = row.get(1)?;
-                        Ok((min_id, max_id))
-                    },
-                )?;
-                if range.0 > range.1 {
-                    return Ok(());
-                };
-                // `first_serial` must be decreased, otherwise if `Context::flush_status_updates()`
-                // runs in parallel, it would miss the race and instead of resending just remove the
-                // updates thinking that they have been already sent.
-                conn.execute(
-                    "INSERT INTO smtp_status_updates (msg_id, first_serial, last_serial, descr) \
-                     VALUES(?, ?, ?, '') \
-                     ON CONFLICT(msg_id) \
-                     DO UPDATE SET first_serial=min(first_serial - 1, excluded.first_serial)",
-                    (msg.id, range.0, range.1),
-                )?;
-                Ok(())
-            };
-            context.sql.call_write(conn_fn).await?;
-        }
-        context.scheduler.interrupt_smtp().await;
     }
     Ok(())
 }
@@ -4400,10 +4346,9 @@ pub async fn add_device_msg_with_importance(
             timestamp_rcvd,
             type,state,
             txt,
-            txt_normalized,
             param,
             rfc724_mid)
-            VALUES (?,?,?,?,?,?,?,?,?,?,?,?);",
+            VALUES (?,?,?,?,?,?,?,?,?,?,?);",
                 (
                     chat_id,
                     ContactId::DEVICE,
@@ -4414,7 +4359,6 @@ pub async fn add_device_msg_with_importance(
                     msg.viewtype,
                     state,
                     &msg.text,
-                    message::normalize_text(&msg.text),
                     msg.param.to_string(),
                     rfc724_mid,
                 ),
@@ -4518,8 +4462,8 @@ pub(crate) async fn add_info_msg_with_cmd(
 
     let row_id =
     context.sql.insert(
-        "INSERT INTO msgs (chat_id,from_id,to_id,timestamp,timestamp_sent,timestamp_rcvd,type,state,txt,txt_normalized,rfc724_mid,ephemeral_timer,param,mime_in_reply_to)
-        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?);",
+        "INSERT INTO msgs (chat_id,from_id,to_id,timestamp,timestamp_sent,timestamp_rcvd,type,state,txt,rfc724_mid,ephemeral_timer, param,mime_in_reply_to)
+        VALUES (?,?,?, ?,?,?,?,?, ?,?,?, ?,?);",
         (
             chat_id,
             from_id.unwrap_or(ContactId::INFO),
@@ -4530,7 +4474,6 @@ pub(crate) async fn add_info_msg_with_cmd(
             Viewtype::Text,
             MessageState::InNoticed,
             text,
-            message::normalize_text(text),
             rfc724_mid,
             ephemeral_timer,
             param.to_string(),
@@ -4575,8 +4518,8 @@ pub(crate) async fn update_msg_text_and_timestamp(
     context
         .sql
         .execute(
-            "UPDATE msgs SET txt=?, txt_normalized=?, timestamp=? WHERE id=?;",
-            (text, message::normalize_text(text), timestamp, msg_id),
+            "UPDATE msgs SET txt=?, timestamp=? WHERE id=?;",
+            (text, timestamp, msg_id),
         )
         .await?;
     context.emit_msgs_changed(chat_id, msg_id);
@@ -4668,7 +4611,7 @@ impl Context {
                     .0
             }
             SyncId::Msgids(msgids) => {
-                let msg = message::get_by_rfc724_mids(self, msgids)
+                let msg = message::get_latest_by_rfc724_mids(self, msgids)
                     .await?
                     .with_context(|| format!("No message found for Message-IDs {msgids:?}"))?;
                 ChatId::lookup_by_message(&msg)
@@ -4688,14 +4631,6 @@ impl Context {
             SyncAction::SetContacts(addrs) => set_contacts_by_addrs(self, chat_id, addrs).await,
         }
     }
-
-    /// Emits the appropriate `MsgsChanged` event. Should be called if the number of unnoticed
-    /// archived chats could decrease. In general we don't want to make an extra db query to know if
-    /// a noticied chat is archived. Emitting events should be cheap, a false-positive `MsgsChanged`
-    /// is ok.
-    pub(crate) fn on_archived_chats_maybe_noticed(&self) {
-        self.emit_msgs_changed(DC_CHAT_ID_ARCHIVED_LINK, MsgId::new(0));
-    }
 }
 
 #[cfg(test)]
@@ -5088,7 +5023,6 @@ mod tests {
 
         // Bob leaves the chat.
         remove_contact_from_chat(&bob, bob_chat_id, ContactId::SELF).await?;
-        bob.pop_sent_msg().await;
 
         // Bob receives a msg about Alice adding Claire to the group.
         bob.recv_msg(&alice_sent_add_msg).await;
@@ -5141,7 +5075,6 @@ mod tests {
         let sent_msg = alice.pop_sent_msg().await;
         bob.recv_msg(&sent_msg).await;
         remove_contact_from_chat(&bob, bob_chat_id, bob_fiona_contact_id).await?;
-        bob.pop_sent_msg().await;
 
         // This doesn't add Fiona back because Bob just removed them.
         let sent_msg = alice.send_text(alice_chat_id, "Welcome, Fiona!").await;
@@ -5867,27 +5800,7 @@ mod tests {
         assert_eq!(DC_CHAT_ID_ARCHIVED_LINK.get_fresh_msg_cnt(&t).await?, 2);
 
         // mark one of the archived+muted chats as noticed: check that the archive-link counter is changed as well
-        t.evtracker.clear_events();
         marknoticed_chat(&t, claire_chat_id).await?;
-        let ev = t
-            .evtracker
-            .get_matching(|ev| {
-                matches!(
-                    ev,
-                    EventType::MsgsChanged {
-                        chat_id: DC_CHAT_ID_ARCHIVED_LINK,
-                        ..
-                    }
-                )
-            })
-            .await;
-        assert_eq!(
-            ev,
-            EventType::MsgsChanged {
-                chat_id: DC_CHAT_ID_ARCHIVED_LINK,
-                msg_id: MsgId::new(0),
-            }
-        );
         assert_eq!(bob_chat_id.get_fresh_msg_cnt(&t).await?, 2);
         assert_eq!(claire_chat_id.get_fresh_msg_cnt(&t).await?, 0);
         assert_eq!(DC_CHAT_ID_ARCHIVED_LINK.get_fresh_msg_cnt(&t).await?, 1);

src/chatlist.rs

@@ -82,13 +82,11 @@ impl Chatlist {
     ///   not needed when DC_GCL_ARCHIVED_ONLY is already set)
     /// - if the flag DC_GCL_ADD_ALLDONE_HINT is set, DC_CHAT_ID_ALLDONE_HINT
     ///   is added as needed.
-    ///
     /// `query`: An optional query for filtering the list. Only chats matching this query
-    /// are returned. When `is:unread` is contained in the query, the chatlist is
-    /// filtered such that only chats with unread messages show up.
-    ///
+    ///     are returned. When `is:unread` is contained in the query, the chatlist is
+    ///     filtered such that only chats with unread messages show up.
     /// `query_contact_id`: An optional contact ID for filtering the list. Only chats including this contact ID
-    /// are returned.
+    ///     are returned.
     pub async fn try_load(
         context: &Context,
         listflags: usize,

src/config.rs

@@ -6,7 +6,7 @@ use std::str::FromStr;
 
 use anyhow::{ensure, Context as _, Result};
 use base64::Engine as _;
-use deltachat_contact_tools::{addr_cmp, sanitize_single_line};
+use deltachat_contact_tools::addr_cmp;
 use serde::{Deserialize, Serialize};
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumString};
@@ -20,7 +20,7 @@ use crate::log::LogExt;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
 use crate::provider::{get_provider_by_id, Provider};
 use crate::sync::{self, Sync::*, SyncData};
-use crate::tools::get_abs_path;
+use crate::tools::{get_abs_path, improve_single_line_input};
 
 /// The available configuration keys.
 #[derive(
@@ -257,9 +257,6 @@ pub enum Config {
     /// True if account is a chatmail account.
     IsChatmail,
 
-    /// True if account is muted.
-    IsMuted,
-
     /// All secondary self addresses separated by spaces
     /// (`addr1@example.org addr2@example.org addr3@example.org`)
     SecondaryAddrs,
@@ -317,8 +314,7 @@ pub enum Config {
     #[strum(props(default = "0"))]
     DownloadLimit,
 
-    /// Enable sending and executing (applying) sync messages. Sending requires `BccSelf` to be set
-    /// and `Bot` unset.
+    /// Enable sending and executing (applying) sync messages. Sending requires `BccSelf` to be set.
     #[strum(props(default = "1"))]
     SyncMsgs,
 
@@ -382,14 +378,14 @@ impl Config {
     /// multiple users are sharing an account. Another example is `Self::SyncMsgs` itself which
     /// mustn't be controlled by other devices.
     pub(crate) fn is_synced(&self) -> bool {
-        // NB: We don't restart IO from the synchronisation code, so `MvboxMove` isn't effective
-        // immediately if `ConfiguredMvboxFolder` is unset, but only after a reconnect (see
-        // `Imap::prepare()`).
+        // We don't restart IO from the synchronisation code, so this is to be on the safe side.
+        if self.needs_io_restart() {
+            return false;
+        }
         matches!(
             self,
             Self::Displayname
                 | Self::MdnsEnabled
-                | Self::MvboxMove
                 | Self::ShowEmails
                 | Self::Selfavatar
                 | Self::Selfstatus,
@@ -497,13 +493,6 @@ impl Context {
                 .is_some())
     }
 
-    /// Returns true if sync messages should be sent.
-    pub(crate) async fn should_send_sync_msgs(&self) -> Result<bool> {
-        Ok(self.get_config_bool(Config::SyncMsgs).await?
-            && self.get_config_bool(Config::BccSelf).await?
-            && !self.get_config_bool(Config::Bot).await?)
-    }
-
     /// Gets configured "delete_server_after" value.
     ///
     /// `None` means never delete the message, `Some(0)` means delete
@@ -611,7 +600,7 @@ impl Context {
         mut value: Option<&str>,
     ) -> Result<()> {
         Self::check_config(key, value)?;
-        let sync = sync == Sync && key.is_synced() && self.is_configured().await?;
+        let sync = sync == Sync && key.is_synced();
         let better_value;
 
         match key {
@@ -650,7 +639,7 @@ impl Context {
             }
             Config::Displayname => {
                 if let Some(v) = value {
-                    better_value = sanitize_single_line(v);
+                    better_value = improve_single_line_input(v);
                     value = Some(&better_value);
                 }
                 self.sql.set_raw_config(key.as_ref(), value).await?;
@@ -688,7 +677,7 @@ impl Context {
         {
             return Ok(());
         }
-        self.scheduler.interrupt_smtp().await;
+        Box::pin(self.send_sync_msg()).await.log_err(self).ok();
         Ok(())
     }
 
@@ -984,12 +973,15 @@ mod tests {
         sync(&alice0, &alice1).await;
         assert_eq!(alice1.get_config_bool(Config::MdnsEnabled).await?, false);
 
-        for key in [Config::ShowEmails, Config::MvboxMove] {
-            let val = alice0.get_config_bool(key).await?;
-            alice0.set_config_bool(key, !val).await?;
-            sync(&alice0, &alice1).await;
-            assert_eq!(alice1.get_config_bool(key).await?, !val);
-        }
+        let show_emails = alice0.get_config_bool(Config::ShowEmails).await?;
+        alice0
+            .set_config_bool(Config::ShowEmails, !show_emails)
+            .await?;
+        sync(&alice0, &alice1).await;
+        assert_eq!(
+            alice1.get_config_bool(Config::ShowEmails).await?,
+            !show_emails
+        );
 
         // `Config::SyncMsgs` mustn't be synced.
         alice0.set_config_bool(Config::SyncMsgs, false).await?;
@@ -1054,8 +1046,7 @@ mod tests {
 
         let status = "Synced via usual message";
         alice0.set_config(Config::Selfstatus, Some(status)).await?;
-        alice0.send_sync_msg().await?;
-        alice0.pop_sent_msg().await;
+        alice0.pop_sent_msg().await; // Sync message
         let status1 = "Synced via sync message";
         alice1.set_config(Config::Selfstatus, Some(status1)).await?;
         tcm.send_recv(alice0, alice1, "hi Alice!").await;
@@ -1078,8 +1069,7 @@ mod tests {
         alice0
             .set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
             .await?;
-        alice0.send_sync_msg().await?;
-        alice0.pop_sent_msg().await;
+        alice0.pop_sent_msg().await; // Sync message
         let file = alice1.dir.path().join("avatar.jpg");
         let bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
         tokio::fs::write(&file, bytes).await?;

src/configure.rs

@@ -459,7 +459,6 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     progress!(ctx, 900);
 
     if imap_session.is_chatmail() {
-        ctx.set_config(Config::IsChatmail, Some("1")).await?;
         ctx.set_config(Config::SentboxWatch, None).await?;
         ctx.set_config(Config::MvboxMove, Some("0")).await?;
         ctx.set_config(Config::OnlyFetchMvbox, None).await?;
@@ -513,8 +512,8 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
 
 /// Retrieve available autoconfigurations.
 ///
-/// A. Search configurations from the domain used in the email-address
-/// B. If we have no configuration yet, search configuration in Thunderbird's central database
+/// A Search configurations from the domain used in the email-address, prefer encrypted
+/// B. If we have no configuration yet, search configuration in Thunderbird's centeral database
 async fn get_autoconfig(
     ctx: &Context,
     param: &LoginParam,
@@ -625,14 +624,14 @@ async fn try_imap_one_param(
 
     match imap.connect(context).await {
         Err(err) => {
-            info!(context, "IMAP failure: {err:#}.");
+            info!(context, "failure: {:#}", err);
             Err(ConfigurationError {
                 config: inf,
                 msg: format!("{err:#}"),
             })
         }
         Ok(session) => {
-            info!(context, "IMAP success: {inf}.");
+            info!(context, "success: {}", inf);
             Ok((imap, session))
         }
     }
@@ -666,13 +665,13 @@ async fn try_smtp_one_param(
         .connect(context, param, socks5_config, addr, provider_strict_tls)
         .await
     {
-        info!(context, "SMTP failure: {err:#}.");
+        info!(context, "failure: {}", err);
         Err(ConfigurationError {
             config: inf,
             msg: format!("{err:#}"),
         })
     } else {
-        info!(context, "SMTP success: {inf}.");
+        info!(context, "success: {}", inf);
         smtp.disconnect();
         Ok(())
     }
@@ -730,7 +729,7 @@ pub enum Error {
 
     #[error("XML error at position {position}: {error}")]
     InvalidXml {
-        position: u64,
+        position: usize,
         #[source]
         error: quick_xml::Error,
     },

src/configure/auto_mozilla.rs

@@ -80,7 +80,7 @@ fn parse_server<B: BufRead>(
         })
         .map(|typ| {
             typ.unwrap()
-                .decode_and_unescape_value(reader.decoder())
+                .decode_and_unescape_value(reader)
                 .unwrap_or_default()
                 .to_lowercase()
         })
@@ -191,7 +191,7 @@ fn parse_xml_with_address(in_emailaddr: &str, xml_raw: &str) -> Result<MozAutoco
     };
 
     let mut reader = quick_xml::Reader::from_str(xml_raw);
-    reader.config_mut().trim_text(true);
+    reader.trim_text(true);
 
     let moz_ac = parse_xml_reader(&mut reader).map_err(|error| Error::InvalidXml {
         position: reader.buffer_position(),

src/configure/auto_outlook.rs

@@ -162,7 +162,7 @@ fn parse_xml_reader<B: BufRead>(
 
 fn parse_xml(xml_raw: &str) -> Result<ParsingResult, Error> {
     let mut reader = quick_xml::Reader::from_str(xml_raw);
-    reader.config_mut().trim_text(true);
+    reader.trim_text(true);
 
     parse_xml_reader(&mut reader).map_err(|error| Error::InvalidXml {
         position: reader.buffer_position(),

src/contact.rs

@@ -11,7 +11,7 @@ use async_channel::{self as channel, Receiver, Sender};
 use base64::Engine as _;
 pub use deltachat_contact_tools::may_be_valid_addr;
 use deltachat_contact_tools::{
-    self as contact_tools, addr_cmp, addr_normalize, sanitize_name, sanitize_name_and_addr,
+    self as contact_tools, addr_cmp, addr_normalize, sanitize_name_and_addr, strip_rtlo_characters,
     ContactAddress, VcardContact,
 };
 use deltachat_derive::{FromSql, ToSql};
@@ -37,7 +37,9 @@ use crate::param::{Param, Params};
 use crate::peerstate::Peerstate;
 use crate::sql::{self, params_iter};
 use crate::sync::{self, Sync::*};
-use crate::tools::{duration_to_str, get_abs_path, smeared_time, time, SystemTime};
+use crate::tools::{
+    duration_to_str, get_abs_path, improve_single_line_input, smeared_time, time, SystemTime,
+};
 use crate::{chat, chatlist_events, stock_str};
 
 /// Time during which a contact is considered as seen recently.
@@ -624,7 +626,9 @@ impl Contact {
         name: &str,
         addr: &str,
     ) -> Result<ContactId> {
-        let (name, addr) = sanitize_name_and_addr(name, addr);
+        let name = improve_single_line_input(name);
+
+        let (name, addr) = sanitize_name_and_addr(&name, addr);
         let addr = ContactAddress::new(&addr)?;
 
         let (contact_id, sth_modified) =
@@ -642,7 +646,7 @@ impl Contact {
             set_blocked(context, Nosync, contact_id, false).await?;
         }
 
-        if sync.into() && sth_modified != Modifier::None {
+        if sync.into() {
             chat::sync(
                 context,
                 chat::SyncId::ContactAddr(addr.to_string()),
@@ -747,7 +751,7 @@ impl Contact {
     /// - "name": name passed as function argument, belonging to the given origin
     /// - "row_name": current name used in the database, typically set to "name"
     /// - "row_authname": name as authorized from a contact, set only through a From-header
-    ///   Depending on the origin, both, "row_name" and "row_authname" are updated from "name".
+    /// Depending on the origin, both, "row_name" and "row_authname" are updated from "name".
     ///
     /// Returns the contact_id and a `Modifier` value indicating if a modification occurred.
     pub(crate) async fn add_or_lookup(
@@ -765,7 +769,7 @@ impl Contact {
             return Ok((ContactId::SELF, sth_modified));
         }
 
-        let mut name = sanitize_name(name);
+        let mut name = strip_rtlo_characters(name);
         #[allow(clippy::collapsible_if)]
         if origin <= Origin::OutgoingTo {
             // The user may accidentally have written to a "noreply" address with another MUA:
@@ -997,7 +1001,7 @@ impl Contact {
     /// - if the flag DC_GCL_ADD_SELF is set, SELF is added to the list unless filtered by other parameters
     /// - if the flag DC_GCL_VERIFIED_ONLY is set, only verified contacts are returned.
     ///   if DC_GCL_VERIFIED_ONLY is not set, verified and unverified contacts are returned.
-    ///   `query` is a string to filter the list.
+    /// `query` is a string to filter the list.
     pub async fn get_all(
         context: &Context,
         listflags: u32,
@@ -1920,7 +1924,7 @@ impl RecentlySeenLoop {
 
 #[cfg(test)]
 mod tests {
-    use deltachat_contact_tools::may_be_valid_addr;
+    use deltachat_contact_tools::{may_be_valid_addr, normalize_name};
 
     use super::*;
     use crate::chat::{get_chat_contacts, send_text_msg, Chat};
@@ -1959,6 +1963,15 @@ mod tests {
         assert_eq!(may_be_valid_addr("user@domain.tld."), false);
     }
 
+    #[test]
+    fn test_normalize_name() {
+        assert_eq!(&normalize_name(" hello world   "), "hello world");
+        assert_eq!(&normalize_name("<"), "<");
+        assert_eq!(&normalize_name(">"), ">");
+        assert_eq!(&normalize_name("'"), "'");
+        assert_eq!(&normalize_name("\""), "\"");
+    }
+
     #[test]
     fn test_normalize_addr() {
         assert_eq!(addr_normalize("mailto:john@doe.com"), "john@doe.com");

src/context.rs

@@ -541,10 +541,18 @@ impl Context {
         }
 
         // update quota (to send warning if full) - but only check it once in a while
-        if self
-            .quota_needs_update(DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT)
-            .await
-        {
+        let quota_needs_update = {
+            let quota = self.quota.read().await;
+            quota
+                .as_ref()
+                .filter(|quota| {
+                    time_elapsed(&quota.modified)
+                        > Duration::from_secs(DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT)
+                })
+                .is_none()
+        };
+
+        if quota_needs_update {
             if let Err(err) = self.update_recent_quota(&mut session).await {
                 warn!(self, "Failed to update quota: {err:#}.");
             }
@@ -814,10 +822,6 @@ impl Context {
         }
 
         res.insert("is_chatmail", self.is_chatmail().await?.to_string());
-        res.insert(
-            "is_muted",
-            self.get_config_bool(Config::IsMuted).await?.to_string(),
-        );
 
         if let Some(metadata) = &*self.metadata.read().await {
             if let Some(comment) = &metadata.comment {
@@ -1255,12 +1259,12 @@ impl Context {
         Ok(list)
     }
 
-    /// Searches for messages containing the query string case-insensitively.
+    /// Searches for messages containing the query string.
     ///
     /// If `chat_id` is provided this searches only for messages in this chat, if `chat_id`
     /// is `None` this searches messages from all chats.
     pub async fn search_msgs(&self, chat_id: Option<ChatId>, query: &str) -> Result<Vec<MsgId>> {
-        let real_query = query.trim().to_lowercase();
+        let real_query = query.trim();
         if real_query.is_empty() {
             return Ok(Vec::new());
         }
@@ -1276,7 +1280,7 @@ impl Context {
                  WHERE m.chat_id=?
                    AND m.hidden=0
                    AND ct.blocked=0
-                   AND IFNULL(txt_normalized, txt) LIKE ?
+                   AND txt LIKE ?
                  ORDER BY m.timestamp,m.id;",
                     (chat_id, str_like_in_text),
                     |row| row.get::<_, MsgId>("id"),
@@ -1312,7 +1316,7 @@ impl Context {
                    AND m.hidden=0
                    AND c.blocked!=1
                    AND ct.blocked=0
-                   AND IFNULL(txt_normalized, txt) LIKE ?
+                   AND m.txt LIKE ?
                  ORDER BY m.id DESC LIMIT 1000",
                     (str_like_in_text,),
                     |row| row.get::<_, MsgId>("id"),
@@ -1342,7 +1346,7 @@ impl Context {
         Ok(sentbox.as_deref() == Some(folder_name))
     }
 
-    /// Returns true if given folder name is the name of the "DeltaChat" folder.
+    /// Returns true if given folder name is the name of the "Delta Chat" folder.
     pub async fn is_mvbox(&self, folder_name: &str) -> Result<bool> {
         let mvbox = self.get_config(Config::ConfiguredMvboxFolder).await?;
         Ok(mvbox.as_deref() == Some(folder_name))
@@ -1554,22 +1558,6 @@ mod tests {
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 1);
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_muted_context() -> Result<()> {
-        let t = TestContext::new_alice().await;
-        assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 0);
-        t.set_config(Config::IsMuted, Some("1")).await?;
-        let chat = t.create_chat_with_contact("", "bob@g.it").await;
-        receive_msg(&t, &chat).await;
-
-        // muted contexts should still show dimmed badge counters eg. in the sidebars,
-        // (same as muted chats show dimmed badge counters in the chatlist)
-        // therefore the fresh messages count should not be affected.
-        assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 1);
-
-        Ok(())
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_blobdir_exists() {
         let tmp = tempfile::tempdir().unwrap();
@@ -1733,8 +1721,6 @@ mod tests {
         msg2.set_text("barbaz".to_string());
         send_msg(&alice, chat.id, &mut msg2).await?;
 
-        alice.send_text(chat.id, "Δ-Chat").await;
-
         // Global search with a part of text finds the message.
         let res = alice.search_msgs(None, "ob").await?;
         assert_eq!(res.len(), 1);
@@ -1747,12 +1733,6 @@ mod tests {
         assert_eq!(res.first(), Some(&msg2.id));
         assert_eq!(res.get(1), Some(&msg1.id));
 
-        // Search is case-insensitive.
-        for chat_id in [None, Some(chat.id)] {
-            let res = alice.search_msgs(chat_id, "δ-chat").await?;
-            assert_eq!(res.len(), 1);
-        }
-
         // Global search with longer text does not find any message.
         let res = alice.search_msgs(None, "foobarbaz").await?;
         assert!(res.is_empty());

src/dehtml.rs

@@ -129,7 +129,7 @@ fn dehtml_quick_xml(buf: &str) -> (String, String) {
     };
 
     let mut reader = quick_xml::Reader::from_str(buf);
-    reader.config_mut().check_end_names = false;
+    reader.check_end_names(false);
 
     let mut buf = Vec::new();
 
@@ -299,7 +299,7 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
                 })
             {
                 let href = href
-                    .decode_and_unescape_value(reader.decoder())
+                    .decode_and_unescape_value(reader)
                     .unwrap_or_default()
                     .to_string();
 
@@ -348,7 +348,7 @@ fn maybe_push_tag(
 fn tag_contains_attr(event: &BytesStart, reader: &Reader<impl BufRead>, name: &str) -> bool {
     event.attributes().any(|r| {
         r.map(|a| {
-            a.decode_and_unescape_value(reader.decoder())
+            a.decode_and_unescape_value(reader)
                 .map(|v| v == name)
                 .unwrap_or(false)
         })
@@ -457,7 +457,7 @@ mod tests {
 
     #[test]
     fn test_dehtml_parse_href() {
-        let html = "<a href=url>text</a>";
+        let html = "<a href=url>text</a";
         let plain = dehtml(html).unwrap().text;
 
         assert_eq!(plain, "[text](url)");

src/download.rs

@@ -184,7 +184,7 @@ impl Session {
             bail!("Attempt to fetch UID 0");
         }
 
-        self.select_with_uidvalidity(context, folder).await?;
+        self.select_folder(context, folder).await?;
 
         // we are connected, and the folder is selected
         info!(context, "Downloading message {}/{} fully...", folder, uid);

src/ephemeral.rs

@@ -447,7 +447,7 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu
                 for (msg_id, chat_id, viewtype, location_id) in rows {
                     transaction.execute(
                         "UPDATE msgs
-                     SET chat_id=?, txt='', txt_normalized=NULL, subject='', txt_raw='',
+                     SET chat_id=?, txt='', subject='', txt_raw='',
                          mime_headers='', from_id=0, to_id=0, param=''
                      WHERE id=?",
                         (DC_CHAT_ID_TRASH, msg_id),
@@ -1024,7 +1024,7 @@ mod tests {
         t.send_text(self_chat.id, "Saved message, which we delete manually")
             .await;
         let msg = t.get_last_msg_in(self_chat.id).await;
-        msg.id.trash(&t, false).await?;
+        msg.id.trash(&t).await?;
         check_msg_is_deleted(&t, &self_chat, msg.id).await;
 
         self_chat
@@ -1304,7 +1304,7 @@ mod tests {
         let msg = alice.get_last_msg().await;
 
         // Message is deleted when its timer expires.
-        msg.id.trash(&alice, false).await?;
+        msg.id.trash(&alice).await?;
 
         // Message with Message-ID <third@example.com>, referencing <first@example.com> and
         // <second@example.com>, is received.  The message <second@example.come> is not in the

src/imap.rs

@@ -16,7 +16,7 @@ use std::{
 use anyhow::{bail, format_err, Context as _, Result};
 use async_channel::Receiver;
 use async_imap::types::{Fetch, Flag, Name, NameAttribute, UnsolicitedResponse};
-use deltachat_contact_tools::ContactAddress;
+use deltachat_contact_tools::{normalize_name, ContactAddress};
 use futures::{FutureExt as _, StreamExt, TryStreamExt};
 use futures_lite::FutureExt;
 use num_traits::FromPrimitive;
@@ -36,6 +36,7 @@ use crate::login_param::{CertificateChecks, LoginParam, ServerLoginParam};
 use crate::message::{self, Message, MessageState, MessengerMessage, MsgId, Viewtype};
 use crate::mimeparser;
 use crate::oauth2::get_oauth2_access_token;
+use crate::provider::Socket;
 use crate::receive_imf::{
     from_field_to_contact_id, get_prefetch_parent_message, receive_imf_inner, ReceivedMsg,
 };
@@ -312,7 +313,7 @@ impl Imap {
         if !ratelimit_duration.is_zero() {
             warn!(
                 context,
-                "IMAP got rate limited, waiting for {} until can connect.",
+                "IMAP got rate limited, waiting for {} until can connect",
                 duration_to_str(ratelimit_duration),
             );
             let interrupted = async {
@@ -341,16 +342,52 @@ impl Imap {
         );
         self.conn_backoff_ms = max(BACKOFF_MIN_MS, self.conn_backoff_ms);
 
-        let connection_res = Client::connect(
-            context,
-            self.lp.server.as_ref(),
-            self.lp.port,
-            self.strict_tls,
-            self.socks5_config.clone(),
-            self.lp.security,
-        )
-        .await;
+        let connection_res: Result<Client> =
+            if self.lp.security == Socket::Starttls || self.lp.security == Socket::Plain {
+                let imap_server: &str = self.lp.server.as_ref();
+                let imap_port = self.lp.port;
 
+                if let Some(socks5_config) = &self.socks5_config {
+                    if self.lp.security == Socket::Starttls {
+                        Client::connect_starttls_socks5(
+                            context,
+                            imap_server,
+                            imap_port,
+                            socks5_config.clone(),
+                            self.strict_tls,
+                        )
+                        .await
+                    } else {
+                        Client::connect_insecure_socks5(
+                            context,
+                            imap_server,
+                            imap_port,
+                            socks5_config.clone(),
+                        )
+                        .await
+                    }
+                } else if self.lp.security == Socket::Starttls {
+                    Client::connect_starttls(context, imap_server, imap_port, self.strict_tls).await
+                } else {
+                    Client::connect_insecure(context, imap_server, imap_port).await
+                }
+            } else {
+                let imap_server: &str = self.lp.server.as_ref();
+                let imap_port = self.lp.port;
+
+                if let Some(socks5_config) = &self.socks5_config {
+                    Client::connect_secure_socks5(
+                        context,
+                        imap_server,
+                        imap_port,
+                        self.strict_tls,
+                        socks5_config.clone(),
+                    )
+                    .await
+                } else {
+                    Client::connect_secure(context, imap_server, imap_port, self.strict_tls).await
+                }
+            };
         let client = connection_res?;
         self.conn_backoff_ms = BACKOFF_MIN_MS;
         self.ratelimit.send();
@@ -503,20 +540,18 @@ impl Imap {
     ) -> Result<bool> {
         if should_ignore_folder(context, folder, folder_meaning).await? {
             info!(context, "Not fetching from {folder:?}.");
-            session.new_mail = false;
             return Ok(false);
         }
 
-        session
+        let new_emails = session
             .select_with_uidvalidity(context, folder)
             .await
             .with_context(|| format!("Failed to select folder {folder:?}"))?;
 
-        if !session.new_mail && !fetch_existing_msgs {
+        if !new_emails && !fetch_existing_msgs {
             info!(context, "No new emails in folder {folder:?}.");
             return Ok(false);
         }
-        session.new_mail = false;
 
         let uid_validity = get_uidvalidity(context, folder).await?;
         let old_uid_next = get_uid_next(context, folder).await?;
@@ -563,26 +598,20 @@ impl Imap {
             // in the `INBOX.DeltaChat` folder again.
             let _target;
             let target = if let Some(message_id) = &message_id {
-                let msg_info =
-                    message::rfc724_mid_exists_ex(context, message_id, "deleted=1").await?;
-                let delete = if let Some((_, _, true)) = msg_info {
-                    info!(context, "Deleting locally deleted message {message_id}.");
-                    true
-                } else if let Some((_, ts_sent_old, _)) = msg_info {
+                let is_dup = if let Some((_, ts_sent_old)) =
+                    message::rfc724_mid_exists(context, message_id).await?
+                {
                     let is_chat_msg = headers.get_header_value(HeaderDef::ChatVersion).is_some();
                     let ts_sent = headers
                         .get_header_value(HeaderDef::Date)
                         .and_then(|v| mailparse::dateparse(&v).ok())
                         .unwrap_or_default();
-                    let is_dup = is_dup_msg(is_chat_msg, ts_sent, ts_sent_old);
-                    if is_dup {
-                        info!(context, "Deleting duplicate message {message_id}.");
-                    }
-                    is_dup
+                    is_dup_msg(is_chat_msg, ts_sent, ts_sent_old)
                 } else {
                     false
                 };
-                if delete {
+                if is_dup {
+                    info!(context, "Deleting duplicate message {message_id}.");
                     &delete_target
                 } else if context
                     .sql
@@ -736,6 +765,10 @@ impl Imap {
         context: &Context,
         session: &mut Session,
     ) -> Result<()> {
+        if context.get_config_bool(Config::Bot).await? {
+            return Ok(()); // Bots don't want those messages
+        }
+
         add_all_recipients_as_contacts(context, session, Config::ConfiguredSentboxFolder)
             .await
             .context("failed to get recipients from the sentbox")?;
@@ -805,7 +838,7 @@ impl Session {
         // Collect pairs of UID and Message-ID.
         let mut msgs = BTreeMap::new();
 
-        self.select_with_uidvalidity(context, folder).await?;
+        self.select_folder(context, folder).await?;
 
         let mut list = self
             .uid_fetch("1:*", RFC724MID_UID)
@@ -1006,7 +1039,7 @@ impl Session {
             // MOVE/DELETE operations. This does not result in multiple SELECT commands
             // being sent because `select_folder()` does nothing if the folder is already
             // selected.
-            self.select_with_uidvalidity(context, folder).await?;
+            self.select_folder(context, folder).await?;
 
             // Empty target folder name means messages should be deleted.
             if target.is_empty() {
@@ -1054,7 +1087,7 @@ impl Session {
             .await?;
 
         for (folder, rowid_set, uid_set) in UidGrouper::from(rows) {
-            self.select_with_uidvalidity(context, &folder)
+            self.select_folder(context, &folder)
                 .await
                 .context("failed to select folder")?;
 
@@ -1098,7 +1131,7 @@ impl Session {
             return Ok(());
         }
 
-        self.select_with_uidvalidity(context, folder)
+        self.select_folder(context, folder)
             .await
             .context("failed to select folder")?;
 
@@ -1164,9 +1197,6 @@ impl Session {
         set_modseq(context, folder, highest_modseq)
             .await
             .with_context(|| format!("failed to set MODSEQ for folder {folder}"))?;
-        if !updated_chat_ids.is_empty() {
-            context.on_archived_chats_maybe_noticed();
-        }
         for updated_chat_id in updated_chat_ids {
             context.emit_event(EventType::MsgsNoticed(updated_chat_id));
             chatlist_events::emit_chatlist_item_changed(context, updated_chat_id);
@@ -2391,6 +2421,12 @@ async fn add_all_recipients_as_contacts(
 
     let mut any_modified = false;
     for recipient in recipients {
+        let display_name_normalized = recipient
+            .display_name
+            .as_ref()
+            .map(|s| normalize_name(s))
+            .unwrap_or_default();
+
         let recipient_addr = match ContactAddress::new(&recipient.addr) {
             Err(err) => {
                 warn!(
@@ -2406,7 +2442,7 @@ async fn add_all_recipients_as_contacts(
 
         let (_, modified) = Contact::add_or_lookup(
             context,
-            &recipient.display_name.unwrap_or_default(),
+            &display_name_normalized,
             &recipient_addr,
             Origin::OutgoingTo,
         )

src/imap/client.rs

@@ -1,7 +1,9 @@
-use std::net::SocketAddr;
-use std::ops::{Deref, DerefMut};
+use std::{
+    ops::{Deref, DerefMut},
+    time::Duration,
+};
 
-use anyhow::{bail, format_err, Context as _, Result};
+use anyhow::{Context as _, Result};
 use async_imap::Client as ImapClient;
 use async_imap::Session as ImapSession;
 use tokio::io::BufWriter;
@@ -9,14 +11,15 @@ use tokio::io::BufWriter;
 use super::capabilities::Capabilities;
 use super::session::Session;
 use crate::context::Context;
-use crate::net::dns::{lookup_host_with_cache, update_connect_timestamp};
+use crate::net::connect_tcp;
 use crate::net::session::SessionStream;
 use crate::net::tls::wrap_tls;
-use crate::net::{connect_tcp_inner, connect_tls_inner};
-use crate::provider::Socket;
 use crate::socks::Socks5Config;
 use fast_socks5::client::Socks5Stream;
 
+/// IMAP connection, write and read timeout.
+pub(crate) const IMAP_TIMEOUT: Duration = Duration::from_secs(60);
+
 #[derive(Debug)]
 pub(crate) struct Client {
     inner: ImapClient<Box<dyn SessionStream>>,
@@ -95,63 +98,14 @@ impl Client {
         Ok(Session::new(session, capabilities))
     }
 
-    pub async fn connect(
+    pub async fn connect_secure(
         context: &Context,
-        host: &str,
+        hostname: &str,
         port: u16,
         strict_tls: bool,
-        socks5_config: Option<Socks5Config>,
-        security: Socket,
     ) -> Result<Self> {
-        if let Some(socks5_config) = socks5_config {
-            let client = match security {
-                Socket::Automatic => bail!("IMAP port security is not configured"),
-                Socket::Ssl => {
-                    Client::connect_secure_socks5(context, host, port, strict_tls, socks5_config)
-                        .await?
-                }
-                Socket::Starttls => {
-                    Client::connect_starttls_socks5(context, host, port, socks5_config, strict_tls)
-                        .await?
-                }
-                Socket::Plain => {
-                    Client::connect_insecure_socks5(context, host, port, socks5_config).await?
-                }
-            };
-            Ok(client)
-        } else {
-            let mut first_error = None;
-            let load_cache =
-                strict_tls && (security == Socket::Ssl || security == Socket::Starttls);
-            for resolved_addr in lookup_host_with_cache(context, host, port, load_cache).await? {
-                let res = match security {
-                    Socket::Automatic => bail!("IMAP port security is not configured"),
-                    Socket::Ssl => Client::connect_secure(resolved_addr, host, strict_tls).await,
-                    Socket::Starttls => {
-                        Client::connect_starttls(resolved_addr, host, strict_tls).await
-                    }
-                    Socket::Plain => Client::connect_insecure(resolved_addr).await,
-                };
-                match res {
-                    Ok(client) => {
-                        let ip_addr = resolved_addr.ip().to_string();
-                        if load_cache {
-                            update_connect_timestamp(context, host, &ip_addr).await?;
-                        }
-                        return Ok(client);
-                    }
-                    Err(err) => {
-                        warn!(context, "Failed to connect to {resolved_addr}: {err:#}.");
-                        first_error.get_or_insert(err);
-                    }
-                }
-            }
-            Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
-        }
-    }
-
-    async fn connect_secure(addr: SocketAddr, hostname: &str, strict_tls: bool) -> Result<Self> {
-        let tls_stream = connect_tls_inner(addr, hostname, strict_tls, "imap").await?;
+        let tcp_stream = connect_tcp(context, hostname, port, IMAP_TIMEOUT, strict_tls).await?;
+        let tls_stream = wrap_tls(strict_tls, hostname, tcp_stream).await?;
         let buffered_stream = BufWriter::new(tls_stream);
         let session_stream: Box<dyn SessionStream> = Box::new(buffered_stream);
         let mut client = Client::new(session_stream);
@@ -162,8 +116,8 @@ impl Client {
         Ok(client)
     }
 
-    async fn connect_insecure(addr: SocketAddr) -> Result<Self> {
-        let tcp_stream = connect_tcp_inner(addr).await?;
+    pub async fn connect_insecure(context: &Context, hostname: &str, port: u16) -> Result<Self> {
+        let tcp_stream = connect_tcp(context, hostname, port, IMAP_TIMEOUT, false).await?;
         let buffered_stream = BufWriter::new(tcp_stream);
         let session_stream: Box<dyn SessionStream> = Box::new(buffered_stream);
         let mut client = Client::new(session_stream);
@@ -174,12 +128,17 @@ impl Client {
         Ok(client)
     }
 
-    async fn connect_starttls(addr: SocketAddr, host: &str, strict_tls: bool) -> Result<Self> {
-        let tcp_stream = connect_tcp_inner(addr).await?;
+    pub async fn connect_starttls(
+        context: &Context,
+        hostname: &str,
+        port: u16,
+        strict_tls: bool,
+    ) -> Result<Self> {
+        let tcp_stream = connect_tcp(context, hostname, port, IMAP_TIMEOUT, strict_tls).await?;
 
         // Run STARTTLS command and convert the client back into a stream.
         let buffered_tcp_stream = BufWriter::new(tcp_stream);
-        let mut client = async_imap::Client::new(buffered_tcp_stream);
+        let mut client = ImapClient::new(buffered_tcp_stream);
         let _greeting = client
             .read_response()
             .await
@@ -191,7 +150,7 @@ impl Client {
         let buffered_tcp_stream = client.into_inner();
         let tcp_stream = buffered_tcp_stream.into_inner();
 
-        let tls_stream = wrap_tls(strict_tls, host, "imap", tcp_stream)
+        let tls_stream = wrap_tls(strict_tls, hostname, tcp_stream)
             .await
             .context("STARTTLS upgrade failed")?;
 
@@ -201,7 +160,7 @@ impl Client {
         Ok(client)
     }
 
-    async fn connect_secure_socks5(
+    pub async fn connect_secure_socks5(
         context: &Context,
         domain: &str,
         port: u16,
@@ -209,9 +168,9 @@ impl Client {
         socks5_config: Socks5Config,
     ) -> Result<Self> {
         let socks5_stream = socks5_config
-            .connect(context, domain, port, strict_tls)
+            .connect(context, domain, port, IMAP_TIMEOUT, strict_tls)
             .await?;
-        let tls_stream = wrap_tls(strict_tls, domain, "imap", socks5_stream).await?;
+        let tls_stream = wrap_tls(strict_tls, domain, socks5_stream).await?;
         let buffered_stream = BufWriter::new(tls_stream);
         let session_stream: Box<dyn SessionStream> = Box::new(buffered_stream);
         let mut client = Client::new(session_stream);
@@ -222,13 +181,15 @@ impl Client {
         Ok(client)
     }
 
-    async fn connect_insecure_socks5(
+    pub async fn connect_insecure_socks5(
         context: &Context,
         domain: &str,
         port: u16,
         socks5_config: Socks5Config,
     ) -> Result<Self> {
-        let socks5_stream = socks5_config.connect(context, domain, port, false).await?;
+        let socks5_stream = socks5_config
+            .connect(context, domain, port, IMAP_TIMEOUT, false)
+            .await?;
         let buffered_stream = BufWriter::new(socks5_stream);
         let session_stream: Box<dyn SessionStream> = Box::new(buffered_stream);
         let mut client = Client::new(session_stream);
@@ -239,7 +200,7 @@ impl Client {
         Ok(client)
     }
 
-    async fn connect_starttls_socks5(
+    pub async fn connect_starttls_socks5(
         context: &Context,
         hostname: &str,
         port: u16,
@@ -247,7 +208,7 @@ impl Client {
         strict_tls: bool,
     ) -> Result<Self> {
         let socks5_stream = socks5_config
-            .connect(context, hostname, port, strict_tls)
+            .connect(context, hostname, port, IMAP_TIMEOUT, strict_tls)
             .await?;
 
         // Run STARTTLS command and convert the client back into a stream.
@@ -264,7 +225,7 @@ impl Client {
         let buffered_socks5_stream = client.into_inner();
         let socks5_stream: Socks5Stream<_> = buffered_socks5_stream.into_inner();
 
-        let tls_stream = wrap_tls(strict_tls, hostname, "imap", socks5_stream)
+        let tls_stream = wrap_tls(strict_tls, hostname, socks5_stream)
             .await
             .context("STARTTLS upgrade failed")?;
         let buffered_stream = BufWriter::new(tls_stream);

src/imap/idle.rs

@@ -9,8 +9,7 @@ use tokio::time::timeout;
 use super::session::Session;
 use super::Imap;
 use crate::context::Context;
-use crate::imap::FolderMeaning;
-use crate::net::TIMEOUT;
+use crate::imap::{client::IMAP_TIMEOUT, FolderMeaning};
 use crate::tools::{self, time_elapsed};
 
 /// Timeout after which IDLE is finished
@@ -30,13 +29,9 @@ impl Session {
     ) -> Result<Self> {
         use futures::future::FutureExt;
 
-        self.select_with_uidvalidity(context, folder).await?;
+        self.select_folder(context, folder).await?;
 
         if self.server_sent_unsolicited_exists(context)? {
-            self.new_mail = true;
-        }
-
-        if self.new_mail {
             return Ok(self);
         }
 
@@ -52,7 +47,7 @@ impl Session {
 
         // At this point IDLE command was sent and we received a "+ idling" response. We will now
         // read from the stream without getting any data for up to `IDLE_TIMEOUT`. If we don't
-        // disable read timeout, we would get a timeout after `crate::net::TIMEOUT`, which is a lot
+        // disable read timeout, we would get a timeout after `IMAP_TIMEOUT`, which is a lot
         // shorter than `IDLE_TIMEOUT`.
         handle.as_mut().set_read_timeout(None);
         let (idle_wait, interrupt) = handle.wait_with_timeout(IDLE_TIMEOUT);
@@ -94,12 +89,9 @@ impl Session {
             .await
             .with_context(|| format!("{folder}: IMAP IDLE protocol timed out"))?
             .with_context(|| format!("{folder}: IMAP IDLE failed"))?;
-        session.as_mut().set_read_timeout(Some(TIMEOUT));
+        session.as_mut().set_read_timeout(Some(IMAP_TIMEOUT));
         self.inner = session;
 
-        // Fetch mail once we exit IDLE.
-        self.new_mail = true;
-
         Ok(self)
     }
 }

src/imap/select_folder.rs

@@ -10,6 +10,12 @@ type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
+    #[error("IMAP Connection Lost or no connection established")]
+    ConnectionLost,
+
+    #[error("IMAP Folder name invalid: {0}")]
+    BadFolderName(String),
+
     #[error("Got a NO response when trying to select {0}, usually this means that it doesn't exist: {1}")]
     NoFolder(String, String),
 
@@ -27,8 +33,7 @@ impl ImapSession {
     /// Issues a CLOSE command if selected folder needs expunge,
     /// i.e. if Delta Chat marked a message there as deleted previously.
     ///
-    /// CLOSE is considerably faster than an EXPUNGE
-    /// because no EXPUNGE responses are sent, see
+    /// CLOSE is considerably faster than an EXPUNGE, see
     /// <https://tools.ietf.org/html/rfc3501#section-6.4.2>
     pub(super) async fn maybe_close_folder(&mut self, context: &Context) -> anyhow::Result<()> {
         if let Some(folder) = &self.selected_folder {
@@ -39,7 +44,6 @@ impl ImapSession {
                 info!(context, "close/expunge succeeded");
                 self.selected_folder = None;
                 self.selected_folder_needs_expunge = false;
-                self.new_mail = false;
             }
         }
         Ok(())
@@ -48,7 +52,11 @@ impl ImapSession {
     /// Selects a folder, possibly updating uid_validity and, if needed,
     /// expunging the folder to remove delete-marked messages.
     /// Returns whether a new folder was selected.
-    async fn select_folder(&mut self, context: &Context, folder: &str) -> Result<NewlySelected> {
+    pub(crate) async fn select_folder(
+        &mut self,
+        context: &Context,
+        folder: &str,
+    ) -> Result<NewlySelected> {
         // if there is a new folder and the new folder is equal to the selected one, there's nothing to do.
         // if there is _no_ new folder, we continue as we might want to expunge below.
         if let Some(selected_folder) = &self.selected_folder {
@@ -77,6 +85,10 @@ impl ImapSession {
                 self.selected_mailbox = Some(mailbox);
                 Ok(NewlySelected::Yes)
             }
+            Err(async_imap::error::Error::ConnectionLost) => Err(Error::ConnectionLost),
+            Err(async_imap::error::Error::Validate(_)) => {
+                Err(Error::BadFolderName(folder.to_string()))
+            }
             Err(async_imap::error::Error::No(response)) => {
                 Err(Error::NoFolder(folder.to_string(), response))
             }
@@ -116,14 +128,13 @@ impl ImapSession {
     /// When selecting a folder for the first time, sets the uid_next to the current
     /// mailbox.uid_next so that no old emails are fetched.
     ///
-    /// Updates `self.new_mail` if folder was previously unselected
-    /// and new mails are detected after selecting,
-    /// i.e. UIDNEXT advanced while the folder was closed.
+    /// Returns Result<new_emails> (i.e. whether new emails arrived),
+    /// if in doubt, returns new_emails=true so emails are fetched.
     pub(crate) async fn select_with_uidvalidity(
         &mut self,
         context: &Context,
         folder: &str,
-    ) -> Result<()> {
+    ) -> Result<bool> {
         let newly_selected = self
             .select_or_create_folder(context, folder)
             .await
@@ -180,26 +191,28 @@ impl ImapSession {
         mailbox.uid_next = new_uid_next;
 
         if new_uid_validity == old_uid_validity {
-            if newly_selected == NewlySelected::Yes {
-                if let Some(new_uid_next) = new_uid_next {
-                    if new_uid_next < old_uid_next {
-                        warn!(
-                            context,
-                            "The server illegally decreased the uid_next of folder {folder:?} from {old_uid_next} to {new_uid_next} without changing validity ({new_uid_validity}), resyncing UIDs...",
-                        );
-                        set_uid_next(context, folder, new_uid_next).await?;
-                        context.schedule_resync().await?;
-                    }
-
-                    // If UIDNEXT changed, there are new emails.
-                    self.new_mail |= new_uid_next != old_uid_next;
-                } else {
-                    warn!(context, "Folder {folder} was just selected but we failed to determine UIDNEXT, assume that it has new mail.");
-                    self.new_mail = true;
+            let new_emails = if newly_selected == NewlySelected::No {
+                // The folder was not newly selected i.e. no SELECT command was run. This means that mailbox.uid_next
+                // was not updated and may contain an incorrect value. So, just return true so that
+                // the caller tries to fetch new messages (we could of course run a SELECT command now, but trying to fetch
+                // new messages is only one command, just as a SELECT command)
+                true
+            } else if let Some(new_uid_next) = new_uid_next {
+                if new_uid_next < old_uid_next {
+                    warn!(
+                        context,
+                        "The server illegally decreased the uid_next of folder {folder:?} from {old_uid_next} to {new_uid_next} without changing validity ({new_uid_validity}), resyncing UIDs...",
+                    );
+                    set_uid_next(context, folder, new_uid_next).await?;
+                    context.schedule_resync().await?;
                 }
-            }
+                new_uid_next != old_uid_next // If UIDNEXT changed, there are new emails
+            } else {
+                // We have no UIDNEXT and if in doubt, return true.
+                true
+            };
 
-            return Ok(());
+            return Ok(new_emails);
         }
 
         // UIDVALIDITY is modified, reset highest seen MODSEQ.
@@ -210,7 +223,6 @@ impl ImapSession {
         let new_uid_next = new_uid_next.unwrap_or_default();
         set_uid_next(context, folder, new_uid_next).await?;
         set_uidvalidity(context, folder, new_uid_validity).await?;
-        self.new_mail = true;
 
         // Collect garbage entries in `imap` table.
         context
@@ -233,7 +245,7 @@ impl ImapSession {
             old_uid_next,
             old_uid_validity,
         );
-        Ok(())
+        Ok(false)
     }
 }
 

src/imap/session.rs

@@ -40,11 +40,6 @@ pub(crate) struct Session {
     pub selected_mailbox: Option<Mailbox>,
 
     pub selected_folder_needs_expunge: bool,
-
-    /// True if currently selected folder has new messages.
-    ///
-    /// Should be false if no folder is currently selected.
-    pub new_mail: bool,
 }
 
 impl Deref for Session {
@@ -72,7 +67,6 @@ impl Session {
             selected_folder: None,
             selected_mailbox: None,
             selected_folder_needs_expunge: false,
-            new_mail: false,
         }
     }
 

src/imex.rs

@@ -1,35 +1,41 @@
 //! # Import/export module.
 
+use std::any::Any;
 use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
 
 use ::pgp::types::KeyTrait;
 use anyhow::{bail, ensure, format_err, Context as _, Result};
 use deltachat_contact_tools::EmailAddress;
-use futures::TryStreamExt;
+use futures::StreamExt;
 use futures_lite::FutureExt;
-
+use rand::{thread_rng, Rng};
 use tokio::fs::{self, File};
 use tokio_tar::Archive;
 
-use crate::blob::BlobDirContents;
-use crate::chat::{self, delete_and_reset_all_device_msgs};
+use crate::blob::{BlobDirContents, BlobObject};
+use crate::chat::{self, delete_and_reset_all_device_msgs, ChatId};
+use crate::config::Config;
+use crate::contact::ContactId;
 use crate::context::Context;
 use crate::e2ee;
 use crate::events::EventType;
-use crate::key::{self, DcKey, DcSecretKey, SignedPublicKey, SignedSecretKey};
+use crate::key::{
+    self, load_self_secret_key, DcKey, DcSecretKey, SignedPublicKey, SignedSecretKey,
+};
 use crate::log::LogExt;
-use crate::message::{Message, Viewtype};
+use crate::message::{Message, MsgId, Viewtype};
+use crate::mimeparser::SystemMessage;
+use crate::param::Param;
 use crate::pgp;
 use crate::sql;
+use crate::stock_str;
 use crate::tools::{
-    create_folder, delete_file, get_filesuffix_lc, read_file, time, write_file, TempPathGuard,
+    create_folder, delete_file, get_filesuffix_lc, open_file_std, read_file, time, write_file,
 };
 
-mod key_transfer;
 mod transfer;
 
-pub use key_transfer::{continue_key_transfer, initiate_key_transfer};
 pub use transfer::{get_backup, BackupProvider};
 
 // Name of the database file in the backup.
@@ -41,13 +47,12 @@ pub(crate) const BLOBS_BACKUP_NAME: &str = "blobs_backup";
 #[repr(u32)]
 pub enum ImexMode {
     /// Export all private keys and all public keys of the user to the
-    /// directory given as `path`. The default key is written to the files
-    /// `{public,private}-key-<addr>-default-<fingerprint>.asc`, if there are more keys, they are
-    /// written to files as `{public,private}-key-<addr>-<id>-<fingerprint>.asc`.
+    /// directory given as `path`.  The default key is written to the files `public-key-default.asc`
+    /// and `private-key-default.asc`, if there are more keys, they are written to files as
+    /// `public-key-<id>.asc` and `private-key-<id>.asc`
     ExportSelfKeys = 1,
 
-    /// Import private keys found in `path` if it is a directory, otherwise import a private key
-    /// from `path`.
+    /// Import private keys found in the directory given as `path`.
     /// The last imported key is made the default keys unless its name contains the string `legacy`.
     /// Public keys are not imported.
     ImportSelfKeys = 2,
@@ -136,6 +141,117 @@ pub async fn has_backup(_context: &Context, dir_name: &Path) -> Result<String> {
     }
 }
 
+/// Initiates key transfer via Autocrypt Setup Message.
+///
+/// Returns setup code.
+pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
+    let setup_code = create_setup_code(context);
+    /* this may require a keypair to be created. this may take a second ... */
+    let setup_file_content = render_setup_file(context, &setup_code).await?;
+    /* encrypting may also take a while ... */
+    let setup_file_blob = BlobObject::create(
+        context,
+        "autocrypt-setup-message.html",
+        setup_file_content.as_bytes(),
+    )
+    .await?;
+
+    let chat_id = ChatId::create_for_contact(context, ContactId::SELF).await?;
+    let mut msg = Message {
+        viewtype: Viewtype::File,
+        ..Default::default()
+    };
+    msg.param.set(Param::File, setup_file_blob.as_name());
+    msg.subject = stock_str::ac_setup_msg_subject(context).await;
+    msg.param
+        .set(Param::MimeType, "application/autocrypt-setup");
+    msg.param.set_cmd(SystemMessage::AutocryptSetupMessage);
+    msg.force_plaintext();
+    msg.param.set_int(Param::SkipAutocrypt, 1);
+
+    chat::send_msg(context, chat_id, &mut msg).await?;
+    // no maybe_add_bcc_self_device_msg() here.
+    // the ui shows the dialog with the setup code on this device,
+    // it would be too much noise to have two things popping up at the same time.
+    // maybe_add_bcc_self_device_msg() is called on the other device
+    // once the transfer is completed.
+    Ok(setup_code)
+}
+
+/// Renders HTML body of a setup file message.
+///
+/// The `passphrase` must be at least 2 characters long.
+pub async fn render_setup_file(context: &Context, passphrase: &str) -> Result<String> {
+    let passphrase_begin = if let Some(passphrase_begin) = passphrase.get(..2) {
+        passphrase_begin
+    } else {
+        bail!("Passphrase must be at least 2 chars long.");
+    };
+    let private_key = load_self_secret_key(context).await?;
+    let ac_headers = match context.get_config_bool(Config::E2eeEnabled).await? {
+        false => None,
+        true => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
+    };
+    let private_key_asc = private_key.to_asc(ac_headers);
+    let encr = pgp::symm_encrypt(passphrase, private_key_asc.as_bytes())
+        .await?
+        .replace('\n', "\r\n");
+
+    let replacement = format!(
+        concat!(
+            "-----BEGIN PGP MESSAGE-----\r\n",
+            "Passphrase-Format: numeric9x4\r\n",
+            "Passphrase-Begin: {}"
+        ),
+        passphrase_begin
+    );
+    let pgp_msg = encr.replace("-----BEGIN PGP MESSAGE-----", &replacement);
+
+    let msg_subj = stock_str::ac_setup_msg_subject(context).await;
+    let msg_body = stock_str::ac_setup_msg_body(context).await;
+    let msg_body_html = msg_body.replace('\r', "").replace('\n', "<br>");
+    Ok(format!(
+        concat!(
+            "<!DOCTYPE html>\r\n",
+            "<html>\r\n",
+            "  <head>\r\n",
+            "    <title>{}</title>\r\n",
+            "  </head>\r\n",
+            "  <body>\r\n",
+            "    <h1>{}</h1>\r\n",
+            "    <p>{}</p>\r\n",
+            "    <pre>\r\n{}\r\n</pre>\r\n",
+            "  </body>\r\n",
+            "</html>\r\n"
+        ),
+        msg_subj, msg_subj, msg_body_html, pgp_msg
+    ))
+}
+
+/// Creates a new setup code for Autocrypt Setup Message.
+pub fn create_setup_code(_context: &Context) -> String {
+    let mut random_val: u16;
+    let mut rng = thread_rng();
+    let mut ret = String::new();
+
+    for i in 0..9 {
+        loop {
+            random_val = rng.gen();
+            if random_val as usize <= 60000 {
+                break;
+            }
+        }
+        random_val = (random_val as usize % 10000) as u16;
+        ret += &format!(
+            "{}{:04}",
+            if 0 != i { "-" } else { "" },
+            random_val as usize
+        );
+    }
+
+    ret
+}
+
 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);
@@ -149,6 +265,36 @@ async fn maybe_add_bcc_self_device_msg(context: &Context) -> Result<()> {
     Ok(())
 }
 
+/// Continue key transfer via Autocrypt Setup Message.
+///
+/// `msg_id` is the ID of the received Autocrypt Setup Message.
+/// `setup_code` is the code entered by the user.
+pub async fn continue_key_transfer(
+    context: &Context,
+    msg_id: MsgId,
+    setup_code: &str,
+) -> Result<()> {
+    ensure!(!msg_id.is_special(), "wrong id");
+
+    let msg = Message::load_from_db(context, msg_id).await?;
+    ensure!(
+        msg.is_setupmessage(),
+        "Message is no Autocrypt Setup Message."
+    );
+
+    if let Some(filename) = msg.get_file(context) {
+        let file = open_file_std(context, filename)?;
+        let sc = normalize_setup_code(setup_code);
+        let armored_key = decrypt_setup_file(&sc, file).await?;
+        set_self_key(context, &armored_key, true).await?;
+        maybe_add_bcc_self_device_msg(context).await?;
+
+        Ok(())
+    } else {
+        bail!("Message is no Autocrypt Setup Message.");
+    }
+}
+
 async fn set_self_key(context: &Context, armored: &str, set_default: bool) -> Result<()> {
     // try hard to only modify key-state
     let (private_key, header) = SignedSecretKey::from_asc(armored)?;
@@ -199,6 +345,29 @@ async fn set_self_key(context: &Context, armored: &str, set_default: bool) -> Re
     Ok(())
 }
 
+async fn decrypt_setup_file<T: std::io::Read + std::io::Seek>(
+    passphrase: &str,
+    file: T,
+) -> Result<String> {
+    let plain_bytes = pgp::symm_decrypt(passphrase, file).await?;
+    let plain_text = std::string::String::from_utf8(plain_bytes)?;
+
+    Ok(plain_text)
+}
+
+fn normalize_setup_code(s: &str) -> String {
+    let mut out = String::new();
+    for c in s.chars() {
+        if c.is_ascii_digit() {
+            out.push(c);
+            if let 4 | 9 | 14 | 19 | 24 | 29 | 34 | 39 = out.len() {
+                out += "-"
+            }
+        }
+    }
+    out
+}
+
 async fn imex_inner(
     context: &Context,
     what: ImexMode,
@@ -269,126 +438,51 @@ async fn import_backup(
         context.get_dbfile().display()
     );
 
-    import_backup_stream(context, backup_file, file_size, passphrase).await?;
-    Ok(())
-}
-
-/// Imports backup by reading a tar file from a stream.
-///
-/// `file_size` is used to calculate the progress
-/// and emit progress events.
-/// Ideally it is the sum of the entry
-/// sizes without the header overhead,
-/// but can be estimated as tar file size
-/// in which case the progress is underestimated
-/// and may not reach 99.9% by the end of import.
-/// Underestimating is better than
-/// overestimating because the progress
-/// jumps to 100% instead of getting stuck at 99.9%
-/// for some time.
-pub(crate) async fn import_backup_stream<R: tokio::io::AsyncRead + Unpin>(
-    context: &Context,
-    backup_file: R,
-    file_size: u64,
-    passphrase: String,
-) -> Result<()> {
-    import_backup_stream_inner(context, backup_file, file_size, passphrase)
-        .await
-        .0
-}
-
-async fn import_backup_stream_inner<R: tokio::io::AsyncRead + Unpin>(
-    context: &Context,
-    backup_file: R,
-    file_size: u64,
-    passphrase: String,
-) -> (Result<()>,) {
     let mut archive = Archive::new(backup_file);
 
-    let mut entries = match archive.entries() {
-        Ok(entries) => entries,
-        Err(e) => return (Err(e).context("Failed to get archive entries"),),
-    };
-    let mut blobs = Vec::new();
-    // We already emitted ImexProgress(10) above
-    let mut last_progress = 10;
-    const PROGRESS_MIGRATIONS: u128 = 999;
-    let mut total_size: u64 = 0;
-    let mut res: Result<()> = loop {
-        let mut f = match entries.try_next().await {
-            Ok(Some(f)) => f,
-            Ok(None) => break Ok(()),
-            Err(e) => break Err(e).context("Failed to get next entry"),
-        };
-        total_size += match f.header().entry_size() {
-            Ok(size) => size,
-            Err(e) => break Err(e).context("Failed to get entry size"),
-        };
-        let max = PROGRESS_MIGRATIONS - 1;
-        let progress = std::cmp::min(
-            max * u128::from(total_size) / std::cmp::max(u128::from(file_size), 1),
-            max,
-        );
-        if progress > last_progress {
+    let mut entries = archive.entries()?;
+    let mut last_progress = 0;
+    while let Some(file) = entries.next().await {
+        let f = &mut file?;
+
+        let current_pos = f.raw_file_position();
+        let progress = 1000 * current_pos / file_size;
+        if progress != last_progress && progress > 10 && progress < 1000 {
+            // We already emitted ImexProgress(10) above
             context.emit_event(EventType::ImexProgress(progress as usize));
             last_progress = progress;
         }
 
-        let path = match f.path() {
-            Ok(path) => path.to_path_buf(),
-            Err(e) => break Err(e).context("Failed to get entry path"),
-        };
-        if let Err(e) = f.unpack_in(context.get_blobdir()).await {
-            break Err(e).context("Failed to unpack file");
-        }
-        if path.file_name() == Some(OsStr::new(DBFILE_BACKUP_NAME)) {
-            continue;
-        }
-        // async_tar unpacked to $BLOBDIR/BLOBS_BACKUP_NAME/, so we move the file afterwards.
-        let from_path = context.get_blobdir().join(&path);
-        if from_path.is_file() {
-            if let Some(name) = from_path.file_name() {
-                let to_path = context.get_blobdir().join(name);
-                if let Err(e) = fs::rename(&from_path, &to_path).await {
-                    blobs.push(from_path);
-                    break Err(e).context("Failed to move file to blobdir");
+        if f.path()?.file_name() == Some(OsStr::new(DBFILE_BACKUP_NAME)) {
+            // async_tar can't unpack to a specified file name, so we just unpack to the blobdir and then move the unpacked file.
+            f.unpack_in(context.get_blobdir()).await?;
+            let unpacked_database = context.get_blobdir().join(DBFILE_BACKUP_NAME);
+            context
+                .sql
+                .import(&unpacked_database, passphrase.clone())
+                .await
+                .context("cannot import unpacked database")?;
+            fs::remove_file(unpacked_database)
+                .await
+                .context("cannot remove unpacked database")?;
+        } else {
+            // async_tar will unpack to blobdir/BLOBS_BACKUP_NAME, so we move the file afterwards.
+            f.unpack_in(context.get_blobdir()).await?;
+            let from_path = context.get_blobdir().join(f.path()?);
+            if from_path.is_file() {
+                if let Some(name) = from_path.file_name() {
+                    fs::rename(&from_path, context.get_blobdir().join(name)).await?;
+                } else {
+                    warn!(context, "No file name");
                 }
-                blobs.push(to_path);
-            } else {
-                warn!(context, "No file name");
             }
         }
-    };
-    if res.is_err() {
-        for blob in blobs {
-            fs::remove_file(&blob).await.log_err(context).ok();
-        }
     }
 
-    let unpacked_database = context.get_blobdir().join(DBFILE_BACKUP_NAME);
-    if res.is_ok() {
-        res = context
-            .sql
-            .import(&unpacked_database, passphrase.clone())
-            .await
-            .context("cannot import unpacked database");
-    }
-    fs::remove_file(unpacked_database)
-        .await
-        .context("cannot remove unpacked database")
-        .log_err(context)
-        .ok();
-    if res.is_ok() {
-        context.emit_event(EventType::ImexProgress(PROGRESS_MIGRATIONS as usize));
-        res = context.sql.run_migrations(context).await;
-    }
-    if res.is_ok() {
-        delete_and_reset_all_device_msgs(context)
-            .await
-            .log_err(context)
-            .ok();
-    }
-    (res,)
+    context.sql.run_migrations(context).await?;
+    delete_and_reset_all_device_msgs(context).await?;
+
+    Ok(())
 }
 
 /*******************************************************************************
@@ -436,8 +530,8 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
     let now = time();
     let self_addr = context.get_primary_self_addr().await?;
     let (temp_db_path, temp_path, dest_path) = get_next_backup_path(dir, &self_addr, now)?;
-    let temp_db_path = TempPathGuard::new(temp_db_path);
-    let temp_path = TempPathGuard::new(temp_path);
+    let _d1 = DeleteOnDrop(temp_db_path.clone());
+    let _d2 = DeleteOnDrop(temp_path.clone());
 
     export_database(context, &temp_db_path, passphrase, now)
         .await
@@ -450,40 +544,52 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
         dest_path.display(),
     );
 
-    let file = File::create(&temp_path).await?;
-    let blobdir = BlobDirContents::new(context).await?;
-    export_backup_stream(context, &temp_db_path, blobdir, file)
-        .await
-        .context("Exporting backup to file failed")?;
-    fs::rename(temp_path, &dest_path).await?;
-    context.emit_event(EventType::ImexFileWritten(dest_path));
-    Ok(())
+    let res = export_backup_inner(context, &temp_db_path, &temp_path).await;
+
+    match &res {
+        Ok(_) => {
+            fs::rename(temp_path, &dest_path).await?;
+            context.emit_event(EventType::ImexFileWritten(dest_path));
+        }
+        Err(e) => {
+            error!(context, "backup failed: {}", e);
+        }
+    }
+
+    res
+}
+struct DeleteOnDrop(PathBuf);
+impl Drop for DeleteOnDrop {
+    fn drop(&mut self) {
+        let file = self.0.clone();
+        // Not using `tools::delete_file` here because it would send a DeletedBlobFile event
+        // Hack to avoid panic in nested runtime calls of tokio
+        std::fs::remove_file(file).ok();
+    }
 }
 
-/// Exports the database and blobs into a stream.
-pub(crate) async fn export_backup_stream<'a, W>(
-    context: &'a Context,
+async fn export_backup_inner(
+    context: &Context,
     temp_db_path: &Path,
-    blobdir: BlobDirContents<'a>,
-    writer: W,
-) -> Result<()>
-where
-    W: tokio::io::AsyncWrite + tokio::io::AsyncWriteExt + Unpin + Send + 'static,
-{
-    let mut builder = tokio_tar::Builder::new(writer);
+    temp_path: &Path,
+) -> Result<()> {
+    let file = File::create(temp_path).await?;
+
+    let mut builder = tokio_tar::Builder::new(file);
 
     builder
         .append_path_with_name(temp_db_path, DBFILE_BACKUP_NAME)
         .await?;
 
-    let mut last_progress = 10;
+    let blobdir = BlobDirContents::new(context).await?;
+    let mut last_progress = 0;
 
     for (i, blob) in blobdir.iter().enumerate() {
         let mut file = File::open(blob.to_abs_path()).await?;
         let path_in_archive = PathBuf::from(BLOBS_BACKUP_NAME).join(blob.as_name());
         builder.append_file(path_in_archive, &mut file).await?;
-        let progress = std::cmp::min(1000 * i / blobdir.len(), 999);
-        if progress > last_progress {
+        let progress = 1000 * i / blobdir.len();
+        if progress != last_progress && progress > 10 && progress < 1000 {
             context.emit_event(EventType::ImexProgress(progress));
             last_progress = progress;
         }
@@ -589,12 +695,12 @@ async fn export_self_keys(context: &Context, dir: &Path) -> Result<()> {
             },
         )
         .await?;
-    let self_addr = context.get_primary_self_addr().await?;
+
     for (id, public_key, private_key, is_default) in keys {
         let id = Some(id).filter(|_| is_default == 0);
 
         if let Ok(key) = public_key {
-            if let Err(err) = export_key_to_asc_file(context, dir, &self_addr, id, &key).await {
+            if let Err(err) = export_key_to_asc_file(context, dir, id, &key).await {
                 error!(context, "Failed to export public key: {:#}.", err);
                 export_errors += 1;
             }
@@ -602,7 +708,7 @@ async fn export_self_keys(context: &Context, dir: &Path) -> Result<()> {
             export_errors += 1;
         }
         if let Ok(key) = private_key {
-            if let Err(err) = export_key_to_asc_file(context, dir, &self_addr, id, &key).await {
+            if let Err(err) = export_key_to_asc_file(context, dir, id, &key).await {
                 error!(context, "Failed to export private key: {:#}.", err);
                 export_errors += 1;
             }
@@ -615,43 +721,46 @@ async fn export_self_keys(context: &Context, dir: &Path) -> Result<()> {
     Ok(())
 }
 
-/// Returns the exported key file name inside `dir`.
+/*******************************************************************************
+ * Classic key export
+ ******************************************************************************/
 async fn export_key_to_asc_file<T>(
     context: &Context,
     dir: &Path,
-    addr: &str,
     id: Option<i64>,
     key: &T,
-) -> Result<String>
+) -> Result<()>
 where
-    T: DcKey,
+    T: DcKey + Any,
 {
     let file_name = {
-        let kind = match T::is_private() {
-            false => "public",
-            true => "private",
+        let any_key = key as &dyn Any;
+        let kind = if any_key.downcast_ref::<SignedPublicKey>().is_some() {
+            "public"
+        } else if any_key.downcast_ref::<SignedSecretKey>().is_some() {
+            "private"
+        } else {
+            "unknown"
         };
         let id = id.map_or("default".into(), |i| i.to_string());
-        let fp = DcKey::fingerprint(key).hex();
-        format!("{kind}-key-{addr}-{id}-{fp}.asc")
+        dir.join(format!("{}-key-{}.asc", kind, &id))
     };
-    let path = dir.join(&file_name);
     info!(
         context,
-        "Exporting key {:?} to {}.",
+        "Exporting key {:?} to {}",
         key.key_id(),
-        path.display()
+        file_name.display()
     );
 
     // Delete the file if it already exists.
-    delete_file(context, &path).await.ok();
+    delete_file(context, &file_name).await.ok();
 
     let content = key.to_asc(None).into_bytes();
-    write_file(context, &path, &content)
+    write_file(context, &file_name, &content)
         .await
-        .with_context(|| format!("cannot write key to {}", path.display()))?;
-    context.emit_event(EventType::ImexFileWritten(path));
-    Ok(file_name)
+        .with_context(|| format!("cannot write key to {}", file_name.display()))?;
+    context.emit_event(EventType::ImexFileWritten(file_name));
+    Ok(())
 }
 
 /// Exports the database to *dest*, encrypted using *passphrase*.
@@ -710,57 +819,92 @@ async fn export_database(
 mod tests {
     use std::time::Duration;
 
+    use ::pgp::armor::BlockType;
     use tokio::task;
 
     use super::*;
-    use crate::config::Config;
-    use crate::test_utils::{alice_keypair, TestContext};
+    use crate::pgp::{split_armored_data, HEADER_AUTOCRYPT, HEADER_SETUPCODE};
+    use crate::receive_imf::receive_imf;
+    use crate::stock_str::StockMessage;
+    use crate::test_utils::{alice_keypair, TestContext, TestContextManager};
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_render_setup_file() {
+        let t = TestContext::new_alice().await;
+        let msg = render_setup_file(&t, "hello").await.unwrap();
+        println!("{}", &msg);
+        // Check some substrings, indicating things got substituted.
+        assert!(msg.contains("<title>Autocrypt Setup Message</title"));
+        assert!(msg.contains("<h1>Autocrypt Setup Message</h1>"));
+        assert!(msg.contains("<p>This is the Autocrypt Setup Message used to"));
+        assert!(msg.contains("-----BEGIN PGP MESSAGE-----\r\n"));
+        assert!(msg.contains("Passphrase-Format: numeric9x4\r\n"));
+        assert!(msg.contains("Passphrase-Begin: he\r\n"));
+        assert!(msg.contains("-----END PGP MESSAGE-----\r\n"));
+
+        for line in msg.rsplit_terminator('\n') {
+            assert!(line.ends_with('\r'));
+        }
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_render_setup_file_newline_replace() {
+        let t = TestContext::new_alice().await;
+        t.set_stock_translation(StockMessage::AcSetupMsgBody, "hello\r\nthere".to_string())
+            .await
+            .unwrap();
+        let msg = render_setup_file(&t, "pw").await.unwrap();
+        println!("{}", &msg);
+        assert!(msg.contains("<p>hello<br>there</p>"));
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_create_setup_code() {
+        let t = TestContext::new().await;
+        let setupcode = create_setup_code(&t);
+        assert_eq!(setupcode.len(), 44);
+        assert_eq!(setupcode.chars().nth(4).unwrap(), '-');
+        assert_eq!(setupcode.chars().nth(9).unwrap(), '-');
+        assert_eq!(setupcode.chars().nth(14).unwrap(), '-');
+        assert_eq!(setupcode.chars().nth(19).unwrap(), '-');
+        assert_eq!(setupcode.chars().nth(24).unwrap(), '-');
+        assert_eq!(setupcode.chars().nth(29).unwrap(), '-');
+        assert_eq!(setupcode.chars().nth(34).unwrap(), '-');
+        assert_eq!(setupcode.chars().nth(39).unwrap(), '-');
+    }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_export_public_key_to_asc_file() {
         let context = TestContext::new().await;
         let key = alice_keypair().public;
         let blobdir = Path::new("$BLOBDIR");
-        let filename = export_key_to_asc_file(&context.ctx, blobdir, "a@b", None, &key)
+        assert!(export_key_to_asc_file(&context.ctx, blobdir, None, &key)
             .await
-            .unwrap();
-        assert!(filename.starts_with("public-key-a@b-default-"));
-        assert!(filename.ends_with(".asc"));
+            .is_ok());
         let blobdir = context.ctx.get_blobdir().to_str().unwrap();
-        let filename = format!("{blobdir}/{filename}");
+        let filename = format!("{blobdir}/public-key-default.asc");
         let bytes = tokio::fs::read(&filename).await.unwrap();
 
         assert_eq!(bytes, key.to_asc(None).into_bytes());
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_import_private_key_exported_to_asc_file() {
+    async fn test_export_private_key_to_asc_file() {
         let context = TestContext::new().await;
         let key = alice_keypair().secret;
         let blobdir = Path::new("$BLOBDIR");
-        let filename = export_key_to_asc_file(&context.ctx, blobdir, "a@b", None, &key)
+        assert!(export_key_to_asc_file(&context.ctx, blobdir, None, &key)
             .await
-            .unwrap();
-        let fingerprint = filename
-            .strip_prefix("private-key-a@b-default-")
-            .unwrap()
-            .strip_suffix(".asc")
-            .unwrap();
-        assert_eq!(fingerprint, DcKey::fingerprint(&key).hex());
+            .is_ok());
         let blobdir = context.ctx.get_blobdir().to_str().unwrap();
-        let filename = format!("{blobdir}/{filename}");
+        let filename = format!("{blobdir}/private-key-default.asc");
         let bytes = tokio::fs::read(&filename).await.unwrap();
 
         assert_eq!(bytes, key.to_asc(None).into_bytes());
-
-        let alice = &TestContext::new_alice().await;
-        if let Err(err) = imex(alice, ImexMode::ImportSelfKeys, Path::new(&filename), None).await {
-            panic!("got error on import: {err:#}");
-        }
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_export_and_import_key_from_dir() {
+    async fn test_export_and_import_key() {
         let export_dir = tempfile::tempdir().unwrap();
 
         let context = TestContext::new_alice().await;
@@ -786,6 +930,12 @@ mod tests {
         {
             panic!("got error on import: {err:#}");
         }
+
+        let keyfile = export_dir.path().join("private-key-default.asc");
+        let context3 = TestContext::new_alice().await;
+        if let Err(err) = imex(&context3.ctx, ImexMode::ImportSelfKeys, &keyfile, None).await {
+            panic!("got error on import: {err:#}");
+        }
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -930,4 +1080,137 @@ mod tests {
 
         Ok(())
     }
+
+    #[test]
+    fn test_normalize_setup_code() {
+        let norm = normalize_setup_code("123422343234423452346234723482349234");
+        assert_eq!(norm, "1234-2234-3234-4234-5234-6234-7234-8234-9234");
+
+        let norm =
+            normalize_setup_code("\t1 2 3422343234- foo bar-- 423-45 2 34 6234723482349234      ");
+        assert_eq!(norm, "1234-2234-3234-4234-5234-6234-7234-8234-9234");
+    }
+
+    /* S_EM_SETUPFILE is a AES-256 symm. encrypted setup message created by Enigmail
+    with an "encrypted session key", see RFC 4880.  The code is in S_EM_SETUPCODE */
+    const S_EM_SETUPCODE: &str = "1742-0185-6197-1303-7016-8412-3581-4441-0597";
+    const S_EM_SETUPFILE: &str = include_str!("../test-data/message/stress.txt");
+
+    // Autocrypt Setup Message payload "encrypted" with plaintext algorithm.
+    const S_PLAINTEXT_SETUPFILE: &str =
+        include_str!("../test-data/message/plaintext-autocrypt-setup.txt");
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_split_and_decrypt() {
+        let buf_1 = S_EM_SETUPFILE.as_bytes().to_vec();
+        let (typ, headers, base64) = split_armored_data(&buf_1).unwrap();
+        assert_eq!(typ, BlockType::Message);
+        assert!(S_EM_SETUPCODE.starts_with(headers.get(HEADER_SETUPCODE).unwrap()));
+        assert!(!headers.contains_key(HEADER_AUTOCRYPT));
+
+        assert!(!base64.is_empty());
+
+        let setup_file = S_EM_SETUPFILE.to_string();
+        let decrypted =
+            decrypt_setup_file(S_EM_SETUPCODE, std::io::Cursor::new(setup_file.as_bytes()))
+                .await
+                .unwrap();
+
+        let (typ, headers, _base64) = split_armored_data(decrypted.as_bytes()).unwrap();
+
+        assert_eq!(typ, BlockType::PrivateKey);
+        assert_eq!(headers.get(HEADER_AUTOCRYPT), Some(&"mutual".to_string()));
+        assert!(!headers.contains_key(HEADER_SETUPCODE));
+    }
+
+    /// Tests that Autocrypt Setup Message encrypted with "plaintext" algorithm cannot be
+    /// decrypted.
+    ///
+    /// According to <https://datatracker.ietf.org/doc/html/rfc4880#section-13.4>
+    /// "Implementations MUST NOT use plaintext in Symmetrically Encrypted Data packets".
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_decrypt_plaintext_autocrypt_setup_message() {
+        let setup_file = S_PLAINTEXT_SETUPFILE.to_string();
+        let incorrect_setupcode = "0000-0000-0000-0000-0000-0000-0000-0000-0000";
+        assert!(decrypt_setup_file(
+            incorrect_setupcode,
+            std::io::Cursor::new(setup_file.as_bytes()),
+        )
+        .await
+        .is_err());
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_key_transfer() -> Result<()> {
+        let alice = TestContext::new_alice().await;
+
+        let setup_code = initiate_key_transfer(&alice).await?;
+
+        // Get Autocrypt Setup Message.
+        let sent = alice.pop_sent_msg().await;
+
+        // Alice sets up a second device.
+        let alice2 = TestContext::new().await;
+        alice2.set_name("alice2");
+        alice2.configure_addr("alice@example.org").await;
+        alice2.recv_msg(&sent).await;
+        let msg = alice2.get_last_msg().await;
+        assert!(msg.is_setupmessage());
+
+        // Send a message that cannot be decrypted because the keys are
+        // not synchronized yet.
+        let sent = alice2.send_text(msg.chat_id, "Test").await;
+        let trashed_message = alice.recv_msg_opt(&sent).await;
+        assert!(trashed_message.is_none());
+        assert_ne!(alice.get_last_msg().await.get_text(), "Test");
+
+        // Transfer the key.
+        continue_key_transfer(&alice2, msg.id, &setup_code).await?;
+
+        // Alice sends a message to self from the new device.
+        let sent = alice2.send_text(msg.chat_id, "Test").await;
+        alice.recv_msg(&sent).await;
+        assert_eq!(alice.get_last_msg().await.get_text(), "Test");
+
+        Ok(())
+    }
+
+    /// Tests that Autocrypt Setup Messages is only clickable if it is self-sent.
+    /// This prevents Bob from tricking Alice into changing the key
+    /// by sending her an Autocrypt Setup Message as long as Alice's server
+    /// does not allow to forge the `From:` header.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_key_transfer_non_self_sent() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+        let alice = tcm.alice().await;
+        let bob = tcm.bob().await;
+
+        let _setup_code = initiate_key_transfer(&alice).await?;
+
+        // Get Autocrypt Setup Message.
+        let sent = alice.pop_sent_msg().await;
+
+        let rcvd = bob.recv_msg(&sent).await;
+        assert!(!rcvd.is_setupmessage());
+
+        Ok(())
+    }
+
+    /// Tests reception of Autocrypt Setup Message from K-9 6.802.
+    ///
+    /// Unlike Autocrypt Setup Message sent by Delta Chat,
+    /// this message does not contain `Autocrypt-Prefer-Encrypt` header.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_key_transfer_k_9() -> Result<()> {
+        let t = &TestContext::new().await;
+        t.configure_addr("autocrypt@nine.testrun.org").await;
+
+        let raw = include_bytes!("../test-data/message/k-9-autocrypt-setup-message.eml");
+        let received = receive_imf(t, raw, false).await?.unwrap();
+
+        let setup_code = "0655-9868-8252-5455-4232-5158-1237-5333-2638";
+        continue_key_transfer(t, *received.msg_ids.last().unwrap(), setup_code).await?;
+
+        Ok(())
+    }
 }

src/imex/key_transfer.rs

@@ -1,372 +0,0 @@
-//! # Key transfer via Autocrypt Setup Message.
-use rand::{thread_rng, Rng};
-
-use anyhow::{bail, ensure, Result};
-
-use crate::blob::BlobObject;
-use crate::chat::{self, ChatId};
-use crate::config::Config;
-use crate::contact::ContactId;
-use crate::context::Context;
-use crate::imex::maybe_add_bcc_self_device_msg;
-use crate::imex::set_self_key;
-use crate::key::{load_self_secret_key, DcKey};
-use crate::message::{Message, MsgId, Viewtype};
-use crate::mimeparser::SystemMessage;
-use crate::param::Param;
-use crate::pgp;
-use crate::stock_str;
-use crate::tools::open_file_std;
-
-/// Initiates key transfer via Autocrypt Setup Message.
-///
-/// Returns setup code.
-pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
-    let setup_code = create_setup_code(context);
-    /* this may require a keypair to be created. this may take a second ... */
-    let setup_file_content = render_setup_file(context, &setup_code).await?;
-    /* encrypting may also take a while ... */
-    let setup_file_blob = BlobObject::create(
-        context,
-        "autocrypt-setup-message.html",
-        setup_file_content.as_bytes(),
-    )
-    .await?;
-
-    let chat_id = ChatId::create_for_contact(context, ContactId::SELF).await?;
-    let mut msg = Message {
-        viewtype: Viewtype::File,
-        ..Default::default()
-    };
-    msg.param.set(Param::File, setup_file_blob.as_name());
-    msg.subject = stock_str::ac_setup_msg_subject(context).await;
-    msg.param
-        .set(Param::MimeType, "application/autocrypt-setup");
-    msg.param.set_cmd(SystemMessage::AutocryptSetupMessage);
-    msg.force_plaintext();
-    msg.param.set_int(Param::SkipAutocrypt, 1);
-
-    chat::send_msg(context, chat_id, &mut msg).await?;
-    // no maybe_add_bcc_self_device_msg() here.
-    // the ui shows the dialog with the setup code on this device,
-    // it would be too much noise to have two things popping up at the same time.
-    // maybe_add_bcc_self_device_msg() is called on the other device
-    // once the transfer is completed.
-    Ok(setup_code)
-}
-
-/// Continue key transfer via Autocrypt Setup Message.
-///
-/// `msg_id` is the ID of the received Autocrypt Setup Message.
-/// `setup_code` is the code entered by the user.
-pub async fn continue_key_transfer(
-    context: &Context,
-    msg_id: MsgId,
-    setup_code: &str,
-) -> Result<()> {
-    ensure!(!msg_id.is_special(), "wrong id");
-
-    let msg = Message::load_from_db(context, msg_id).await?;
-    ensure!(
-        msg.is_setupmessage(),
-        "Message is no Autocrypt Setup Message."
-    );
-
-    if let Some(filename) = msg.get_file(context) {
-        let file = open_file_std(context, filename)?;
-        let sc = normalize_setup_code(setup_code);
-        let armored_key = decrypt_setup_file(&sc, file).await?;
-        set_self_key(context, &armored_key, true).await?;
-        maybe_add_bcc_self_device_msg(context).await?;
-
-        Ok(())
-    } else {
-        bail!("Message is no Autocrypt Setup Message.");
-    }
-}
-
-/// Renders HTML body of a setup file message.
-///
-/// The `passphrase` must be at least 2 characters long.
-pub async fn render_setup_file(context: &Context, passphrase: &str) -> Result<String> {
-    let passphrase_begin = if let Some(passphrase_begin) = passphrase.get(..2) {
-        passphrase_begin
-    } else {
-        bail!("Passphrase must be at least 2 chars long.");
-    };
-    let private_key = load_self_secret_key(context).await?;
-    let ac_headers = match context.get_config_bool(Config::E2eeEnabled).await? {
-        false => None,
-        true => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
-    };
-    let private_key_asc = private_key.to_asc(ac_headers);
-    let encr = pgp::symm_encrypt(passphrase, private_key_asc.as_bytes())
-        .await?
-        .replace('\n', "\r\n");
-
-    let replacement = format!(
-        concat!(
-            "-----BEGIN PGP MESSAGE-----\r\n",
-            "Passphrase-Format: numeric9x4\r\n",
-            "Passphrase-Begin: {}"
-        ),
-        passphrase_begin
-    );
-    let pgp_msg = encr.replace("-----BEGIN PGP MESSAGE-----", &replacement);
-
-    let msg_subj = stock_str::ac_setup_msg_subject(context).await;
-    let msg_body = stock_str::ac_setup_msg_body(context).await;
-    let msg_body_html = msg_body.replace('\r', "").replace('\n', "<br>");
-    Ok(format!(
-        concat!(
-            "<!DOCTYPE html>\r\n",
-            "<html>\r\n",
-            "  <head>\r\n",
-            "    <title>{}</title>\r\n",
-            "  </head>\r\n",
-            "  <body>\r\n",
-            "    <h1>{}</h1>\r\n",
-            "    <p>{}</p>\r\n",
-            "    <pre>\r\n{}\r\n</pre>\r\n",
-            "  </body>\r\n",
-            "</html>\r\n"
-        ),
-        msg_subj, msg_subj, msg_body_html, pgp_msg
-    ))
-}
-
-/// Creates a new setup code for Autocrypt Setup Message.
-fn create_setup_code(_context: &Context) -> String {
-    let mut random_val: u16;
-    let mut rng = thread_rng();
-    let mut ret = String::new();
-
-    for i in 0..9 {
-        loop {
-            random_val = rng.gen();
-            if random_val as usize <= 60000 {
-                break;
-            }
-        }
-        random_val = (random_val as usize % 10000) as u16;
-        ret += &format!(
-            "{}{:04}",
-            if 0 != i { "-" } else { "" },
-            random_val as usize
-        );
-    }
-
-    ret
-}
-
-async fn decrypt_setup_file<T: std::io::Read + std::io::Seek>(
-    passphrase: &str,
-    file: T,
-) -> Result<String> {
-    let plain_bytes = pgp::symm_decrypt(passphrase, file).await?;
-    let plain_text = std::string::String::from_utf8(plain_bytes)?;
-
-    Ok(plain_text)
-}
-
-fn normalize_setup_code(s: &str) -> String {
-    let mut out = String::new();
-    for c in s.chars() {
-        if c.is_ascii_digit() {
-            out.push(c);
-            if let 4 | 9 | 14 | 19 | 24 | 29 | 34 | 39 = out.len() {
-                out += "-"
-            }
-        }
-    }
-    out
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::pgp::{split_armored_data, HEADER_AUTOCRYPT, HEADER_SETUPCODE};
-    use crate::receive_imf::receive_imf;
-    use crate::stock_str::StockMessage;
-    use crate::test_utils::{TestContext, TestContextManager};
-    use ::pgp::armor::BlockType;
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_render_setup_file() {
-        let t = TestContext::new_alice().await;
-        let msg = render_setup_file(&t, "hello").await.unwrap();
-        println!("{}", &msg);
-        // Check some substrings, indicating things got substituted.
-        assert!(msg.contains("<title>Autocrypt Setup Message</title"));
-        assert!(msg.contains("<h1>Autocrypt Setup Message</h1>"));
-        assert!(msg.contains("<p>This is the Autocrypt Setup Message used to"));
-        assert!(msg.contains("-----BEGIN PGP MESSAGE-----\r\n"));
-        assert!(msg.contains("Passphrase-Format: numeric9x4\r\n"));
-        assert!(msg.contains("Passphrase-Begin: he\r\n"));
-        assert!(msg.contains("-----END PGP MESSAGE-----\r\n"));
-
-        for line in msg.rsplit_terminator('\n') {
-            assert!(line.ends_with('\r'));
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_render_setup_file_newline_replace() {
-        let t = TestContext::new_alice().await;
-        t.set_stock_translation(StockMessage::AcSetupMsgBody, "hello\r\nthere".to_string())
-            .await
-            .unwrap();
-        let msg = render_setup_file(&t, "pw").await.unwrap();
-        println!("{}", &msg);
-        assert!(msg.contains("<p>hello<br>there</p>"));
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_create_setup_code() {
-        let t = TestContext::new().await;
-        let setupcode = create_setup_code(&t);
-        assert_eq!(setupcode.len(), 44);
-        assert_eq!(setupcode.chars().nth(4).unwrap(), '-');
-        assert_eq!(setupcode.chars().nth(9).unwrap(), '-');
-        assert_eq!(setupcode.chars().nth(14).unwrap(), '-');
-        assert_eq!(setupcode.chars().nth(19).unwrap(), '-');
-        assert_eq!(setupcode.chars().nth(24).unwrap(), '-');
-        assert_eq!(setupcode.chars().nth(29).unwrap(), '-');
-        assert_eq!(setupcode.chars().nth(34).unwrap(), '-');
-        assert_eq!(setupcode.chars().nth(39).unwrap(), '-');
-    }
-
-    #[test]
-    fn test_normalize_setup_code() {
-        let norm = normalize_setup_code("123422343234423452346234723482349234");
-        assert_eq!(norm, "1234-2234-3234-4234-5234-6234-7234-8234-9234");
-
-        let norm =
-            normalize_setup_code("\t1 2 3422343234- foo bar-- 423-45 2 34 6234723482349234      ");
-        assert_eq!(norm, "1234-2234-3234-4234-5234-6234-7234-8234-9234");
-    }
-
-    /* S_EM_SETUPFILE is a AES-256 symm. encrypted setup message created by Enigmail
-    with an "encrypted session key", see RFC 4880.  The code is in S_EM_SETUPCODE */
-    const S_EM_SETUPCODE: &str = "1742-0185-6197-1303-7016-8412-3581-4441-0597";
-    const S_EM_SETUPFILE: &str = include_str!("../../test-data/message/stress.txt");
-
-    // Autocrypt Setup Message payload "encrypted" with plaintext algorithm.
-    const S_PLAINTEXT_SETUPFILE: &str =
-        include_str!("../../test-data/message/plaintext-autocrypt-setup.txt");
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_split_and_decrypt() {
-        let buf_1 = S_EM_SETUPFILE.as_bytes().to_vec();
-        let (typ, headers, base64) = split_armored_data(&buf_1).unwrap();
-        assert_eq!(typ, BlockType::Message);
-        assert!(S_EM_SETUPCODE.starts_with(headers.get(HEADER_SETUPCODE).unwrap()));
-        assert!(!headers.contains_key(HEADER_AUTOCRYPT));
-
-        assert!(!base64.is_empty());
-
-        let setup_file = S_EM_SETUPFILE.to_string();
-        let decrypted =
-            decrypt_setup_file(S_EM_SETUPCODE, std::io::Cursor::new(setup_file.as_bytes()))
-                .await
-                .unwrap();
-
-        let (typ, headers, _base64) = split_armored_data(decrypted.as_bytes()).unwrap();
-
-        assert_eq!(typ, BlockType::PrivateKey);
-        assert_eq!(headers.get(HEADER_AUTOCRYPT), Some(&"mutual".to_string()));
-        assert!(!headers.contains_key(HEADER_SETUPCODE));
-    }
-
-    /// Tests that Autocrypt Setup Message encrypted with "plaintext" algorithm cannot be
-    /// decrypted.
-    ///
-    /// According to <https://datatracker.ietf.org/doc/html/rfc4880#section-13.4>
-    /// "Implementations MUST NOT use plaintext in Symmetrically Encrypted Data packets".
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decrypt_plaintext_autocrypt_setup_message() {
-        let setup_file = S_PLAINTEXT_SETUPFILE.to_string();
-        let incorrect_setupcode = "0000-0000-0000-0000-0000-0000-0000-0000-0000";
-        assert!(decrypt_setup_file(
-            incorrect_setupcode,
-            std::io::Cursor::new(setup_file.as_bytes()),
-        )
-        .await
-        .is_err());
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_key_transfer() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-
-        let setup_code = initiate_key_transfer(&alice).await?;
-
-        // Get Autocrypt Setup Message.
-        let sent = alice.pop_sent_msg().await;
-
-        // Alice sets up a second device.
-        let alice2 = TestContext::new().await;
-        alice2.set_name("alice2");
-        alice2.configure_addr("alice@example.org").await;
-        alice2.recv_msg(&sent).await;
-        let msg = alice2.get_last_msg().await;
-        assert!(msg.is_setupmessage());
-
-        // Send a message that cannot be decrypted because the keys are
-        // not synchronized yet.
-        let sent = alice2.send_text(msg.chat_id, "Test").await;
-        let trashed_message = alice.recv_msg_opt(&sent).await;
-        assert!(trashed_message.is_none());
-        assert_ne!(alice.get_last_msg().await.get_text(), "Test");
-
-        // Transfer the key.
-        continue_key_transfer(&alice2, msg.id, &setup_code).await?;
-
-        // Alice sends a message to self from the new device.
-        let sent = alice2.send_text(msg.chat_id, "Test").await;
-        alice.recv_msg(&sent).await;
-        assert_eq!(alice.get_last_msg().await.get_text(), "Test");
-
-        Ok(())
-    }
-
-    /// Tests that Autocrypt Setup Messages is only clickable if it is self-sent.
-    /// This prevents Bob from tricking Alice into changing the key
-    /// by sending her an Autocrypt Setup Message as long as Alice's server
-    /// does not allow to forge the `From:` header.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_key_transfer_non_self_sent() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = tcm.alice().await;
-        let bob = tcm.bob().await;
-
-        let _setup_code = initiate_key_transfer(&alice).await?;
-
-        // Get Autocrypt Setup Message.
-        let sent = alice.pop_sent_msg().await;
-
-        let rcvd = bob.recv_msg(&sent).await;
-        assert!(!rcvd.is_setupmessage());
-
-        Ok(())
-    }
-
-    /// Tests reception of Autocrypt Setup Message from K-9 6.802.
-    ///
-    /// Unlike Autocrypt Setup Message sent by Delta Chat,
-    /// this message does not contain `Autocrypt-Prefer-Encrypt` header.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_key_transfer_k_9() -> Result<()> {
-        let t = &TestContext::new().await;
-        t.configure_addr("autocrypt@nine.testrun.org").await;
-
-        let raw = include_bytes!("../../test-data/message/k-9-autocrypt-setup-message.eml");
-        let received = receive_imf(t, raw, false).await?.unwrap();
-
-        let setup_code = "0655-9868-8252-5455-4232-5158-1237-5333-2638";
-        continue_key_transfer(t, *received.msg_ids.last().unwrap(), setup_code).await?;
-
-        Ok(())
-    }
-}

src/imex/transfer.rs

@@ -1,12 +1,17 @@
 //! Transfer a backup to an other device.
 //!
-//! This module provides support for using [iroh](https://iroh.computer/)
-//! to initiate transfer of a backup to another device using a QR code.
+//! This module provides support for using n0's iroh tool to initiate transfer of a backup
+//! to another device using a QR code.
+//!
+//! Using the iroh terminology there are two parties to this:
 //!
-//! There are two parties to this:
 //! - The *Provider*, which starts a server and listens for connections.
 //! - The *Getter*, which connects to the server and retrieves the data.
 //!
+//! Iroh is designed around the idea of verifying hashes, the downloads are verified as
+//! they are retrieved.  The entire transfer is initiated by requesting the data of a single
+//! root hash.
+//!
 //! Both the provider and the getter are authenticated:
 //!
 //! - The provider is known by its *peer ID*.
@@ -16,30 +21,24 @@
 //! Both these are transferred in the QR code offered to the getter.  This ensures that the
 //! getter can not connect to an impersonated provider and the provider does not offer the
 //! download to an impersonated getter.
-//!
-//! Protocol starts by getter opening a bidirectional QUIC stream
-//! to the provider and sending authentication token.
-//! Provider verifies received authentication token,
-//! sends the size of all files in a backup (database and all blobs)
-//! as an unsigned 64-bit big endian integer and streams the backup in tar format.
-//! Getter receives the backup and acknowledges successful reception
-//! by sending a single byte.
-//! Provider closes the endpoint after receiving an acknowledgment.
 
 use std::future::Future;
+use std::net::Ipv4Addr;
+use std::ops::Deref;
+use std::path::{Path, PathBuf};
 use std::pin::Pin;
-use std::sync::Arc;
 use std::task::Poll;
 
 use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
+use async_channel::Receiver;
 use futures_lite::StreamExt;
-use iroh_net::relay::RelayMode;
-use iroh_net::Endpoint;
-use iroh_old;
-use iroh_old::blobs::Collection;
-use iroh_old::get::DataStream;
-use iroh_old::progress::ProgressEmitter;
-use iroh_old::provider::Ticket;
+use iroh::blobs::Collection;
+use iroh::get::DataStream;
+use iroh::progress::ProgressEmitter;
+use iroh::protocol::AuthToken;
+use iroh::provider::{DataSource, Event, Provider, Ticket};
+use iroh::Hash;
+use iroh_old as iroh;
 use tokio::fs::{self, File};
 use tokio::io::{self, AsyncWriteExt, BufWriter};
 use tokio::sync::broadcast::error::RecvError;
@@ -48,22 +47,19 @@ use tokio::task::{JoinHandle, JoinSet};
 use tokio_stream::wrappers::ReadDirStream;
 use tokio_util::sync::CancellationToken;
 
+use crate::blob::BlobDirContents;
 use crate::chat::{add_device_msg, delete_and_reset_all_device_msgs};
 use crate::context::Context;
-use crate::imex::BlobDirContents;
 use crate::message::{Message, Viewtype};
 use crate::qr::{self, Qr};
 use crate::stock_str::backup_transfer_msg_body;
-use crate::tools::{create_id, time, TempPathGuard};
-use crate::EventType;
+use crate::tools::time;
+use crate::{e2ee, EventType};
 
-use super::{export_backup_stream, export_database, import_backup_stream, DBFILE_BACKUP_NAME};
+use super::{export_database, DBFILE_BACKUP_NAME};
 
 const MAX_CONCURRENT_DIALS: u8 = 16;
 
-/// ALPN protocol identifier for the backup transfer protocol.
-const BACKUP_ALPN: &[u8] = b"/deltachat/backup";
-
 /// Provide or send a backup of this device.
 ///
 /// This creates a backup of the current device and starts a service which offers another
@@ -74,21 +70,15 @@ const BACKUP_ALPN: &[u8] = b"/deltachat/backup";
 ///
 /// This starts a task which acquires the global "ongoing" mutex.  If you need to stop the
 /// task use the [`Context::stop_ongoing`] mechanism.
+///
+/// The task implements [`Future`] and awaiting it will complete once a transfer has been
+/// either completed or aborted.
 #[derive(Debug)]
 pub struct BackupProvider {
-    /// iroh-net endpoint.
-    _endpoint: Endpoint,
-
-    /// iroh-net address.
-    node_addr: iroh_net::NodeAddr,
-
-    /// Authentication token that should be submitted
-    /// to retrieve the backup.
-    auth_token: String,
-
-    /// Handle for the task accepting backup transfer requests.
+    /// The supervisor task, run by [`BackupProvider::watch_provider`].
     handle: JoinHandle<Result<()>>,
-
+    /// The ticket to retrieve the backup collection.
+    ticket: Ticket,
     /// Guard to cancel the provider on drop.
     _drop_guard: tokio_util::sync::DropGuard,
 }
@@ -105,13 +95,9 @@ impl BackupProvider {
     ///
     /// [`Accounts::stop_io`]: crate::accounts::Accounts::stop_io
     pub async fn prepare(context: &Context) -> Result<Self> {
-        let relay_mode = RelayMode::Disabled;
-        let endpoint = Endpoint::builder()
-            .alpns(vec![BACKUP_ALPN.to_vec()])
-            .relay_mode(relay_mode)
-            .bind(0)
-            .await?;
-        let node_addr = endpoint.node_addr().await?;
+        e2ee::ensure_secret_key_exists(context)
+            .await
+            .context("Private key not available, aborting backup export")?;
 
         // Acquire global "ongoing" mutex.
         let cancel_token = context.alloc_ongoing().await?;
@@ -119,153 +105,195 @@ impl BackupProvider {
         let context_dir = context
             .get_blobdir()
             .parent()
-            .context("Context dir not found")?;
+            .ok_or_else(|| anyhow!("Context dir not found"))?;
         let dbfile = context_dir.join(DBFILE_BACKUP_NAME);
         if fs::metadata(&dbfile).await.is_ok() {
             fs::remove_file(&dbfile).await?;
             warn!(context, "Previous database export deleted");
         }
         let dbfile = TempPathGuard::new(dbfile);
-
-        // Authentication token that receiver should send us to receive a backup.
-        let auth_token = create_id();
-
-        let passphrase = String::new();
-
-        export_database(context, &dbfile, passphrase, time())
-            .await
-            .context("Database export failed")?;
-        context.emit_event(EventType::ImexProgress(300));
-
+        let res = tokio::select! {
+            biased;
+            res = Self::prepare_inner(context, &dbfile) => {
+                match res {
+                    Ok(slf) => Ok(slf),
+                    Err(err) => {
+                        error!(context, "Failed to set up second device setup: {:#}", err);
+                        Err(err)
+                    },
+                }
+            },
+            _ = cancel_token.recv() => Err(format_err!("cancelled")),
+        };
+        let (provider, ticket) = match res {
+            Ok((provider, ticket)) => (provider, ticket),
+            Err(err) => {
+                context.free_ongoing().await;
+                return Err(err);
+            }
+        };
         let drop_token = CancellationToken::new();
         let handle = {
             let context = context.clone();
             let drop_token = drop_token.clone();
-            let endpoint = endpoint.clone();
-            let auth_token = auth_token.clone();
             tokio::spawn(async move {
-                Self::accept_loop(
-                    context.clone(),
-                    endpoint,
-                    auth_token,
-                    cancel_token,
-                    drop_token,
-                    dbfile,
-                )
-                .await;
-                info!(context, "Finished accept loop.");
-
+                let res = Self::watch_provider(&context, provider, cancel_token, drop_token).await;
                 context.free_ongoing().await;
 
                 // Explicit drop to move the guards into this future
                 drop(paused_guard);
-                Ok(())
+                drop(dbfile);
+                res
             })
         };
         Ok(Self {
-            _endpoint: endpoint,
-            node_addr,
-            auth_token,
             handle,
+            ticket,
             _drop_guard: drop_token.drop_guard(),
         })
     }
 
-    async fn handle_connection(
-        context: Context,
-        conn: iroh_net::endpoint::Connecting,
-        auth_token: String,
-        dbfile: Arc<TempPathGuard>,
-    ) -> Result<()> {
-        let conn = conn.await?;
-        let (mut send_stream, mut recv_stream) = conn.accept_bi().await?;
-
-        // Read authentication token from the stream.
-        let mut received_auth_token = vec![0u8; auth_token.len()];
-        recv_stream.read_exact(&mut received_auth_token).await?;
-        if received_auth_token.as_slice() != auth_token.as_bytes() {
-            warn!(context, "Received wrong backup authentication token.");
-            return Ok(());
-        }
-
-        info!(context, "Received valid backup authentication token.");
-
-        let blobdir = BlobDirContents::new(&context).await?;
-
-        let mut file_size = 0;
-        file_size += dbfile.metadata()?.len();
-        for blob in blobdir.iter() {
-            file_size += blob.to_abs_path().metadata()?.len()
-        }
-
-        send_stream.write_all(&file_size.to_be_bytes()).await?;
-
-        export_backup_stream(&context, &dbfile, blobdir, send_stream)
+    /// Creates the provider task.
+    ///
+    /// Having this as a function makes it easier to cancel it when needed.
+    async fn prepare_inner(context: &Context, dbfile: &Path) -> Result<(Provider, Ticket)> {
+        // Generate the token up front: we also use it to encrypt the database.
+        let token = AuthToken::generate();
+        context.emit_event(SendProgress::Started.into());
+        export_database(context, dbfile, token.to_string(), time())
             .await
-            .context("Failed to write backup into QUIC stream")?;
-        info!(context, "Finished writing backup into QUIC stream.");
-        let mut buf = [0u8; 1];
-        info!(context, "Waiting for acknowledgment.");
-        recv_stream.read_exact(&mut buf).await?;
-        info!(context, "Received backup reception acknowledgement.");
-        context.emit_event(EventType::ImexProgress(1000));
+            .context("Database export failed")?;
+        context.emit_event(SendProgress::DatabaseExported.into());
 
-        let mut msg = Message::new(Viewtype::Text);
-        msg.text = backup_transfer_msg_body(&context).await;
-        add_device_msg(&context, None, Some(&mut msg)).await?;
+        // Now we can be sure IO is not running.
+        let mut files = vec![DataSource::with_name(
+            dbfile.to_owned(),
+            format!("db/{DBFILE_BACKUP_NAME}"),
+        )];
+        let blobdir = BlobDirContents::new(context).await?;
+        for blob in blobdir.iter() {
+            let path = blob.to_abs_path();
+            let name = format!("blob/{}", blob.as_file_name());
+            files.push(DataSource::with_name(path, name));
+        }
 
-        Ok(())
+        // Start listening.
+        let (db, hash) = iroh::provider::create_collection(files).await?;
+        context.emit_event(SendProgress::CollectionCreated.into());
+        let provider = Provider::builder(db)
+            .bind_addr((Ipv4Addr::UNSPECIFIED, 0).into())
+            .auth_token(token)
+            .spawn()?;
+        context.emit_event(SendProgress::ProviderListening.into());
+        info!(context, "Waiting for remote to connect");
+        let ticket = provider.ticket(hash)?;
+        Ok((provider, ticket))
     }
 
-    async fn accept_loop(
-        context: Context,
-        endpoint: Endpoint,
-        auth_token: String,
-        cancel_token: async_channel::Receiver<()>,
+    /// Supervises the iroh [`Provider`], terminating it when needed.
+    ///
+    /// This will watch the provider and terminate it when:
+    ///
+    /// - A transfer is completed, successful or unsuccessful.
+    /// - An event could not be observed to protect against not knowing of a completed event.
+    /// - The ongoing process is cancelled.
+    ///
+    /// The *cancel_token* is the handle for the ongoing process mutex, when this completes
+    /// we must cancel this operation.
+    async fn watch_provider(
+        context: &Context,
+        mut provider: Provider,
+        cancel_token: Receiver<()>,
         drop_token: CancellationToken,
-        dbfile: TempPathGuard,
-    ) {
-        let dbfile = Arc::new(dbfile);
-        loop {
+    ) -> Result<()> {
+        let mut events = provider.subscribe();
+        let mut total_size = 0;
+        let mut current_size = 0;
+        let res = loop {
             tokio::select! {
                 biased;
-
-                conn = endpoint.accept() => {
-                    if let Some(conn) = conn {
-                        // Got a new in-progress connection.
-                        let context = context.clone();
-                        let auth_token = auth_token.clone();
-                        let dbfile = dbfile.clone();
-                        if let Err(err) = Self::handle_connection(context.clone(), conn, auth_token, dbfile).await {
-                            warn!(context, "Error while handling backup connection: {err:#}.");
-                        } else {
-                            info!(context, "Backup transfer finished successfully.");
-                            break;
+                res = &mut provider => {
+                    break res.context("BackupProvider failed");
+                },
+                maybe_event = events.recv() => {
+                    match maybe_event {
+                        Ok(event) => {
+                            match event {
+                                Event::ClientConnected { ..} => {
+                                    context.emit_event(SendProgress::ClientConnected.into());
+                                }
+                                Event::RequestReceived { .. } => {
+                                }
+                                Event::TransferCollectionStarted { total_blobs_size, .. } => {
+                                    total_size = total_blobs_size;
+                                    context.emit_event(SendProgress::TransferInProgress {
+                                        current_size,
+                                        total_size,
+                                    }.into());
+                                }
+                                Event::TransferBlobCompleted { size, .. } => {
+                                    current_size += size;
+                                    context.emit_event(SendProgress::TransferInProgress {
+                                        current_size,
+                                        total_size,
+                                    }.into());
+                                }
+                                Event::TransferCollectionCompleted { .. } => {
+                                    context.emit_event(SendProgress::TransferInProgress {
+                                        current_size: total_size,
+                                        total_size
+                                    }.into());
+                                    provider.shutdown();
+                                }
+                                Event::TransferAborted { .. } => {
+                                    provider.shutdown();
+                                    break Err(anyhow!("BackupProvider transfer aborted"));
+                                }
+                            }
+                        }
+                        Err(broadcast::error::RecvError::Closed) => {
+                            // We should never see this, provider.join() should complete
+                            // first.
+                        }
+                        Err(broadcast::error::RecvError::Lagged(_)) => {
+                            // We really shouldn't be lagging, if we did we may have missed
+                            // a completion event.
+                            provider.shutdown();
+                            break Err(anyhow!("Missed events from BackupProvider"));
                         }
-                    } else {
-                        break;
                     }
                 },
                 _ = cancel_token.recv() => {
-                    context.emit_event(EventType::ImexProgress(0));
-                    break;
-                }
+                    provider.shutdown();
+                    break Err(anyhow!("BackupProvider cancelled"));
+                },
                 _ = drop_token.cancelled() => {
-                    context.emit_event(EventType::ImexProgress(0));
-                    break;
+                    provider.shutdown();
+                    break Err(anyhow!("BackupProvider dropped"));
                 }
             }
+        };
+        match &res {
+            Ok(_) => {
+                context.emit_event(SendProgress::Completed.into());
+                let mut msg = Message::new(Viewtype::Text);
+                msg.text = backup_transfer_msg_body(context).await;
+                add_device_msg(context, None, Some(&mut msg)).await?;
+            }
+            Err(err) => {
+                error!(context, "Backup transfer failure: {err:#}");
+                context.emit_event(SendProgress::Failed.into())
+            }
         }
+        res
     }
 
     /// Returns a QR code that allows fetching this backup.
     ///
     /// This QR code can be passed to [`get_backup`] on a (different) device.
     pub fn qr(&self) -> Qr {
-        Qr::Backup2 {
-            node_addr: self.node_addr.clone(),
-
-            auth_token: self.auth_token.clone(),
+        Qr::Backup {
+            ticket: self.ticket.clone(),
         }
     }
 }
@@ -273,14 +301,92 @@ impl BackupProvider {
 impl Future for BackupProvider {
     type Output = Result<()>;
 
-    /// Waits for the backup transfer to complete.
     fn poll(mut self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
         Pin::new(&mut self.handle).poll(cx)?
     }
 }
 
-/// Retrieves backup from a legacy backup provider using iroh 0.4.
-pub async fn get_legacy_backup(context: &Context, qr: Qr) -> Result<()> {
+/// A guard which will remove the path when dropped.
+///
+/// It implements [`Deref`] it it can be used as a `&Path`.
+#[derive(Debug)]
+struct TempPathGuard {
+    path: PathBuf,
+}
+
+impl TempPathGuard {
+    fn new(path: PathBuf) -> Self {
+        Self { path }
+    }
+}
+
+impl Drop for TempPathGuard {
+    fn drop(&mut self) {
+        let path = self.path.clone();
+        tokio::spawn(async move {
+            fs::remove_file(&path).await.ok();
+        });
+    }
+}
+
+impl Deref for TempPathGuard {
+    type Target = Path;
+
+    fn deref(&self) -> &Self::Target {
+        &self.path
+    }
+}
+
+/// Create [`EventType::ImexProgress`] events using readable names.
+///
+/// Plus you get warnings if you don't use all variants.
+#[derive(Debug)]
+enum SendProgress {
+    Failed,
+    Started,
+    DatabaseExported,
+    CollectionCreated,
+    ProviderListening,
+    ClientConnected,
+    TransferInProgress { current_size: u64, total_size: u64 },
+    Completed,
+}
+
+impl From<SendProgress> for EventType {
+    fn from(source: SendProgress) -> Self {
+        use SendProgress::*;
+        let num: u16 = match source {
+            Failed => 0,
+            Started => 100,
+            DatabaseExported => 300,
+            CollectionCreated => 350,
+            ProviderListening => 400,
+            ClientConnected => 450,
+            TransferInProgress {
+                current_size,
+                total_size,
+            } => {
+                // the range is 450..=950
+                450 + ((current_size as f64 / total_size as f64) * 500.).floor() as u16
+            }
+            Completed => 1000,
+        };
+        Self::ImexProgress(num.into())
+    }
+}
+
+/// Contacts a backup provider and receives the backup from it.
+///
+/// This uses a QR code to contact another instance of deltachat which is providing a backup
+/// using the [`BackupProvider`].  Once connected it will authenticate using the secrets in
+/// the QR code and retrieve the backup.
+///
+/// This is a long running operation which will only when completed.
+///
+/// Using [`Qr`] as argument is a bit odd as it only accepts one specific variant of it.  It
+/// does avoid having [`iroh::provider::Ticket`] in the primary API however, without
+/// having to revert to untyped bytes.
+pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
     ensure!(
         matches!(qr, Qr::Backup { .. }),
         "QR code for backup must be of type DCBACKUP"
@@ -306,64 +412,6 @@ pub async fn get_legacy_backup(context: &Context, qr: Qr) -> Result<()> {
     res
 }
 
-pub async fn get_backup2(
-    context: &Context,
-    node_addr: iroh_net::NodeAddr,
-    auth_token: String,
-) -> Result<()> {
-    let relay_mode = RelayMode::Disabled;
-
-    let endpoint = Endpoint::builder().relay_mode(relay_mode).bind(0).await?;
-
-    let conn = endpoint.connect(node_addr, BACKUP_ALPN).await?;
-    let (mut send_stream, mut recv_stream) = conn.open_bi().await?;
-    info!(context, "Sending backup authentication token.");
-    send_stream.write_all(auth_token.as_bytes()).await?;
-
-    let passphrase = String::new();
-    info!(context, "Starting to read backup from the stream.");
-
-    let mut file_size_buf = [0u8; 8];
-    recv_stream.read_exact(&mut file_size_buf).await?;
-    let file_size = u64::from_be_bytes(file_size_buf);
-    import_backup_stream(context, recv_stream, file_size, passphrase)
-        .await
-        .context("Failed to import backup from QUIC stream")?;
-    info!(context, "Finished importing backup from the stream.");
-    context.emit_event(EventType::ImexProgress(1000));
-
-    // Send an acknowledgement, but ignore the errors.
-    // We have imported backup successfully already.
-    send_stream.write_all(b".").await.ok();
-    send_stream.finish().await.ok();
-    info!(context, "Sent backup reception acknowledgment.");
-
-    Ok(())
-}
-
-/// Contacts a backup provider and receives the backup from it.
-///
-/// This uses a QR code to contact another instance of deltachat which is providing a backup
-/// using the [`BackupProvider`].  Once connected it will authenticate using the secrets in
-/// the QR code and retrieve the backup.
-///
-/// This is a long running operation which will return only when completed.
-///
-/// Using [`Qr`] as argument is a bit odd as it only accepts specific variants of it.  It
-/// does avoid having [`iroh_old::provider::Ticket`] in the primary API however, without
-/// having to revert to untyped bytes.
-pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
-    match qr {
-        Qr::Backup { .. } => get_legacy_backup(context, qr).await?,
-        Qr::Backup2 {
-            node_addr,
-            auth_token,
-        } => get_backup2(context, node_addr, auth_token).await?,
-        _ => bail!("QR code for backup must be of type DCBACKUP or DCBACKUP2"),
-    }
-    Ok(())
-}
-
 async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
     let ticket = match qr {
         Qr::Backup { ticket } => ticket,
@@ -410,7 +458,7 @@ async fn transfer_from_provider(context: &Context, ticket: &Ticket) -> Result<()
 
     // Perform the transfer.
     let keylog = false; // Do not enable rustls SSLKEYLOGFILE env var functionality
-    let stats = iroh_old::get::run_ticket(
+    let stats = iroh::get::run_ticket(
         ticket,
         keylog,
         MAX_CONCURRENT_DIALS,
@@ -442,7 +490,7 @@ async fn on_blob(
     progress: &ProgressEmitter,
     jobs: &Mutex<JoinSet<()>>,
     ticket: &Ticket,
-    _hash: iroh_old::Hash,
+    _hash: Hash,
     mut reader: DataStream,
     name: String,
 ) -> Result<DataStream> {
@@ -624,6 +672,24 @@ mod tests {
             .await;
     }
 
+    #[test]
+    fn test_send_progress() {
+        let cases = [
+            ((0, 100), 450),
+            ((10, 100), 500),
+            ((50, 100), 700),
+            ((100, 100), 950),
+        ];
+
+        for ((current_size, total_size), progress) in cases {
+            let out = EventType::from(SendProgress::TransferInProgress {
+                current_size,
+                total_size,
+            });
+            assert_eq!(out, EventType::ImexProgress(progress));
+        }
+    }
+
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_drop_provider() {
         let mut tcm = TestContextManager::new();

src/key.rs

@@ -4,7 +4,7 @@ use std::collections::BTreeMap;
 use std::fmt;
 use std::io::Cursor;
 
-use anyhow::{bail, ensure, Context as _, Result};
+use anyhow::{ensure, Context as _, Result};
 use base64::Engine as _;
 use deltachat_contact_tools::EmailAddress;
 use num_traits::FromPrimitive;
@@ -46,26 +46,7 @@ pub(crate) trait DcKey: Serialize + Deserializable + KeyTrait + Clone {
     /// the ASCII-armored representation.
     fn from_asc(data: &str) -> Result<(Self, BTreeMap<String, String>)> {
         let bytes = data.as_bytes();
-        let res = Self::from_armor_single(Cursor::new(bytes));
-        let (key, headers) = match res {
-            Err(pgp::errors::Error::NoMatchingPacket) => match Self::is_private() {
-                true => bail!("No private key packet found"),
-                false => bail!("No public key packet found"),
-            },
-            _ => res.context("rPGP error")?,
-        };
-        let headers = headers
-            .into_iter()
-            .map(|(key, values)| {
-                (
-                    key.trim().to_lowercase(),
-                    values
-                        .last()
-                        .map_or_else(String::new, |s| s.trim().to_string()),
-                )
-            })
-            .collect();
-        Ok((key, headers))
+        Self::from_armor_single(Cursor::new(bytes)).context("rPGP error")
     }
 
     /// Serialise the key as bytes.
@@ -96,8 +77,6 @@ pub(crate) trait DcKey: Serialize + Deserializable + KeyTrait + Clone {
     fn fingerprint(&self) -> Fingerprint {
         Fingerprint::new(KeyTrait::fingerprint(self))
     }
-
-    fn is_private() -> bool;
 }
 
 pub(crate) async fn load_self_public_key(context: &Context) -> Result<SignedPublicKey> {
@@ -189,17 +168,16 @@ impl DcKey for SignedPublicKey {
         // safe to ignore this error.
         // Because we write to a Vec<u8> the io::Write impls never
         // fail and we can hide this error.
-        let headers =
-            header.map(|(key, value)| BTreeMap::from([(key.to_string(), vec![value.to_string()])]));
+        let headers = header.map(|(key, value)| {
+            let mut m = BTreeMap::new();
+            m.insert(key.to_string(), value.to_string());
+            m
+        });
         let mut buf = Vec::new();
-        self.to_armored_writer(&mut buf, headers.as_ref().into())
+        self.to_armored_writer(&mut buf, headers.as_ref())
             .unwrap_or_default();
         std::string::String::from_utf8(buf).unwrap_or_default()
     }
-
-    fn is_private() -> bool {
-        false
-    }
 }
 
 impl DcKey for SignedSecretKey {
@@ -208,17 +186,16 @@ impl DcKey for SignedSecretKey {
         // safe to do these unwraps.
         // Because we write to a Vec<u8> the io::Write impls never
         // fail and we can hide this error.  The string is always ASCII.
-        let headers =
-            header.map(|(key, value)| BTreeMap::from([(key.to_string(), vec![value.to_string()])]));
+        let headers = header.map(|(key, value)| {
+            let mut m = BTreeMap::new();
+            m.insert(key.to_string(), value.to_string());
+            m
+        });
         let mut buf = Vec::new();
-        self.to_armored_writer(&mut buf, headers.as_ref().into())
+        self.to_armored_writer(&mut buf, headers.as_ref())
             .unwrap_or_default();
         std::string::String::from_utf8(buf).unwrap_or_default()
     }
-
-    fn is_private() -> bool {
-        true
-    }
 }
 
 /// Deltachat extension trait for secret keys.

src/location.rs

@@ -109,7 +109,7 @@ impl Kml {
         ensure!(to_parse.len() <= 1024 * 1024, "kml-file is too large");
 
         let mut reader = quick_xml::Reader::from_reader(to_parse);
-        reader.config_mut().trim_text(true);
+        reader.trim_text(true);
 
         let mut kml = Kml::new();
         kml.locations = Vec::with_capacity(100);
@@ -226,7 +226,7 @@ impl Kml {
                     == "addr"
             }) {
                 self.addr = addr
-                    .decode_and_unescape_value(reader.decoder())
+                    .decode_and_unescape_value(reader)
                     .ok()
                     .map(|a| a.into_owned());
             }
@@ -256,7 +256,7 @@ impl Kml {
             }) {
                 let v = acc
                     .unwrap()
-                    .decode_and_unescape_value(reader.decoder())
+                    .decode_and_unescape_value(reader)
                     .unwrap_or_default();
 
                 self.curr.accuracy = v.trim().parse().unwrap_or_default();

src/message.rs

@@ -2,7 +2,6 @@
 
 use std::collections::BTreeSet;
 use std::path::{Path, PathBuf};
-use std::str;
 
 use anyhow::{ensure, format_err, Context as _, Result};
 use deltachat_contact_tools::{parse_vcard, VcardContact};
@@ -11,13 +10,13 @@ use serde::{Deserialize, Serialize};
 use tokio::{fs, io};
 
 use crate::blob::BlobObject;
-use crate::chat::{Chat, ChatId, ChatIdBlocked, ChatVisibility};
+use crate::chat::{Chat, ChatId, ChatIdBlocked};
 use crate::chatlist_events;
 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::{self, Contact, ContactId};
+use crate::contact::{Contact, ContactId};
 use crate::context::Context;
 use crate::debug_logging::set_debug_logging_xdc;
 use crate::download::DownloadState;
@@ -103,31 +102,23 @@ impl MsgId {
     /// We keep some infos to
     /// 1. not download the same message again
     /// 2. be able to delete the message on the server if we want to
-    ///
-    /// * `on_server`: Delete the message on the server also if it is seen on IMAP later, but only
-    ///   if all parts of the message are trashed with this flag. `true` if the user explicitly
-    ///   deletes the message. As for trashing a partially downloaded message when replacing it with
-    ///   a fully downloaded one, see `receive_imf::add_parts()`.
-    pub async fn trash(self, context: &Context, on_server: bool) -> Result<()> {
+    pub async fn trash(self, context: &Context) -> Result<()> {
         let chat_id = DC_CHAT_ID_TRASH;
-        let deleted_subst = match on_server {
-            true => ", deleted=1",
-            false => "",
-        };
         context
             .sql
             .execute(
                 // If you change which information is removed here, also change delete_expired_messages() and
                 // which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH
-                &format!(
-                    "UPDATE msgs SET \
-                     chat_id=?, txt='', txt_normalized=NULL, \
-                     subject='', txt_raw='', \
-                     mime_headers='', \
-                     from_id=0, to_id=0, \
-                     param=''{deleted_subst} \
-                     WHERE id=?"
-                ),
+                r#"
+UPDATE msgs 
+SET 
+  chat_id=?, txt='', 
+  subject='', txt_raw='', 
+  mime_headers='', 
+  from_id=0, to_id=0, 
+  param='' 
+WHERE id=?;
+"#,
                 (chat_id, self),
             )
             .await?;
@@ -1090,30 +1081,6 @@ impl Message {
         Ok(())
     }
 
-    /// Makes message a vCard-containing message using the specified contacts.
-    pub async fn make_vcard(&mut self, context: &Context, contacts: &[ContactId]) -> Result<()> {
-        ensure!(
-            matches!(self.viewtype, Viewtype::File | Viewtype::Vcard),
-            "Wrong viewtype for vCard: {}",
-            self.viewtype,
-        );
-        let vcard = contact::make_vcard(context, contacts).await?;
-        self.set_file_from_bytes(context, "vcard.vcf", vcard.as_bytes(), None)
-            .await
-    }
-
-    /// Updates message state from the vCard attachment.
-    pub(crate) async fn try_set_vcard(&mut self, context: &Context, path: &Path) -> Result<()> {
-        let vcard = fs::read(path).await.context("Could not read {path}")?;
-        if let Some(summary) = get_vcard_summary(&vcard) {
-            self.param.set(Param::Summary1, summary);
-        } else {
-            warn!(context, "try_set_vcard: Not a valid DeltaChat vCard.");
-            self.viewtype = Viewtype::File;
-        }
-        Ok(())
-    }
-
     /// Set different sender name for a message.
     /// This overrides the name set by the `set_config()`-option `displayname`.
     pub fn set_override_sender_name(&mut self, name: Option<String>) {
@@ -1157,27 +1124,6 @@ impl Message {
         Ok(())
     }
 
-    /// Sets message quote text.
-    ///
-    /// If `text` is `Some((text_str, protect))`, `protect` specifies whether `text_str` should only
-    /// be sent encrypted. If it should, but the message is unencrypted, `text_str` is replaced with
-    /// "...".
-    pub fn set_quote_text(&mut self, text: Option<(String, bool)>) {
-        let Some((text, protect)) = text else {
-            self.param.remove(Param::Quote);
-            self.param.remove(Param::ProtectQuote);
-            return;
-        };
-        self.param.set(Param::Quote, text);
-        self.param.set_optional(
-            Param::ProtectQuote,
-            match protect {
-                true => Some("1"),
-                false => None,
-            },
-        );
-    }
-
     /// Sets message quote.
     ///
     /// Message-Id is used to set Reply-To field, message text is used for quote.
@@ -1194,27 +1140,31 @@ impl Message {
             );
             self.in_reply_to = Some(quote.rfc724_mid.clone());
 
+            if quote
+                .param
+                .get_bool(Param::GuaranteeE2ee)
+                .unwrap_or_default()
+            {
+                self.param.set(Param::ProtectQuote, "1");
+            }
+
             let text = quote.get_text();
-            let text = if text.is_empty() {
-                // Use summary, similar to "Image" to avoid sending empty quote.
-                quote
-                    .get_summary(context, None)
-                    .await?
-                    .truncated_text(500)
-                    .to_string()
-            } else {
-                text
-            };
-            self.set_quote_text(Some((
-                text,
-                quote
-                    .param
-                    .get_bool(Param::GuaranteeE2ee)
-                    .unwrap_or_default(),
-            )));
+            self.param.set(
+                Param::Quote,
+                if text.is_empty() {
+                    // Use summary, similar to "Image" to avoid sending empty quote.
+                    quote
+                        .get_summary(context, None)
+                        .await?
+                        .truncated_text(500)
+                        .to_string()
+                } else {
+                    text
+                },
+            );
         } else {
             self.in_reply_to = None;
-            self.set_quote_text(None);
+            self.param.remove(Param::Quote);
         }
 
         Ok(())
@@ -1574,9 +1524,8 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
         if msg.location_id > 0 {
             delete_poi_location(context, msg.location_id).await?;
         }
-        let on_server = true;
         msg_id
-            .trash(context, on_server)
+            .trash(context)
             .await
             .with_context(|| format!("Unable to trash message {msg_id}"))?;
 
@@ -1664,7 +1613,6 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
                     m.param AS param,
                     m.from_id AS from_id,
                     m.rfc724_mid AS rfc724_mid,
-                    c.archived AS archived,
                     c.blocked AS blocked
                  FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id
                  WHERE m.id IN ({}) AND m.chat_id>9",
@@ -1678,20 +1626,16 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
                 let param: Params = row.get::<_, String>("param")?.parse().unwrap_or_default();
                 let from_id: ContactId = row.get("from_id")?;
                 let rfc724_mid: String = row.get("rfc724_mid")?;
-                let visibility: ChatVisibility = row.get("archived")?;
                 let blocked: Option<Blocked> = row.get("blocked")?;
                 let ephemeral_timer: EphemeralTimer = row.get("ephemeral_timer")?;
                 Ok((
-                    (
-                        id,
-                        chat_id,
-                        state,
-                        param,
-                        from_id,
-                        rfc724_mid,
-                        visibility,
-                        blocked.unwrap_or_default(),
-                    ),
+                    id,
+                    chat_id,
+                    state,
+                    param,
+                    from_id,
+                    rfc724_mid,
+                    blocked.unwrap_or_default(),
                     ephemeral_timer,
                 ))
             },
@@ -1699,28 +1643,25 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
         )
         .await?;
 
-    if msgs
-        .iter()
-        .any(|(_, ephemeral_timer)| *ephemeral_timer != EphemeralTimer::Disabled)
-    {
+    if msgs.iter().any(
+        |(_id, _chat_id, _state, _param, _from_id, _rfc724_mid, _blocked, ephemeral_timer)| {
+            *ephemeral_timer != EphemeralTimer::Disabled
+        },
+    ) {
         start_ephemeral_timers_msgids(context, &msg_ids)
             .await
             .context("failed to start ephemeral timers")?;
     }
 
     let mut updated_chat_ids = BTreeSet::new();
-    let mut archived_chats_maybe_noticed = false;
     for (
-        (
-            id,
-            curr_chat_id,
-            curr_state,
-            curr_param,
-            curr_from_id,
-            curr_rfc724_mid,
-            curr_visibility,
-            curr_blocked,
-        ),
+        id,
+        curr_chat_id,
+        curr_state,
+        curr_param,
+        curr_from_id,
+        curr_rfc724_mid,
+        curr_blocked,
         _curr_ephemeral_timer,
     ) in msgs
     {
@@ -1758,17 +1699,12 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
             }
             updated_chat_ids.insert(curr_chat_id);
         }
-        archived_chats_maybe_noticed |=
-            curr_state == MessageState::InFresh && curr_visibility == ChatVisibility::Archived;
     }
 
     for updated_chat_id in updated_chat_ids {
         context.emit_event(EventType::MsgsNoticed(updated_chat_id));
         chatlist_events::emit_chatlist_item_changed(context, updated_chat_id);
     }
-    if archived_chats_maybe_noticed {
-        context.on_archived_chats_maybe_noticed();
-    }
 
     Ok(())
 }
@@ -1933,26 +1869,23 @@ pub async fn estimate_deletion_cnt(
     Ok(cnt)
 }
 
-/// See [`rfc724_mid_exists_ex()`].
+/// See [`rfc724_mid_exists_and()`].
 pub(crate) async fn rfc724_mid_exists(
     context: &Context,
     rfc724_mid: &str,
 ) -> Result<Option<(MsgId, i64)>> {
-    Ok(rfc724_mid_exists_ex(context, rfc724_mid, "1")
-        .await?
-        .map(|(id, ts_sent, _)| (id, ts_sent)))
+    rfc724_mid_exists_and(context, rfc724_mid, "1").await
 }
 
-/// Returns [MsgId] and "sent" timestamp of the most recent message with given `rfc724_mid`
-/// (Message-ID header) and bool `expr` result if such messages exists in the db.
+/// Returns [MsgId] and "sent" timestamp of the message with given `rfc724_mid` (Message-ID header)
+/// if it exists in the db.
 ///
-/// * `expr`: SQL expression additionally passed into `SELECT`. Evaluated to `true` iff it is true
-///   for all messages with the given `rfc724_mid`.
-pub(crate) async fn rfc724_mid_exists_ex(
+/// @param cond SQL subexpression for filtering messages.
+pub(crate) async fn rfc724_mid_exists_and(
     context: &Context,
     rfc724_mid: &str,
-    expr: &str,
-) -> Result<Option<(MsgId, i64, bool)>> {
+    cond: &str,
+) -> Result<Option<(MsgId, i64)>> {
     let rfc724_mid = rfc724_mid.trim_start_matches('<').trim_end_matches('>');
     if rfc724_mid.is_empty() {
         warn!(context, "Empty rfc724_mid passed to rfc724_mid_exists");
@@ -1962,15 +1895,13 @@ pub(crate) async fn rfc724_mid_exists_ex(
     let res = context
         .sql
         .query_row_optional(
-            &("SELECT id, timestamp_sent, MIN(".to_string()
-                + expr
-                + ") FROM msgs WHERE rfc724_mid=? ORDER BY timestamp_sent DESC"),
+            &("SELECT id, timestamp_sent FROM msgs WHERE rfc724_mid=? AND ".to_string() + cond),
             (rfc724_mid,),
             |row| {
                 let msg_id: MsgId = row.get(0)?;
                 let timestamp_sent: i64 = row.get(1)?;
-                let expr_res: bool = row.get(2)?;
-                Ok((msg_id, timestamp_sent, expr_res))
+
+                Ok((msg_id, timestamp_sent))
             },
         )
         .await?;
@@ -1978,43 +1909,21 @@ pub(crate) async fn rfc724_mid_exists_ex(
     Ok(res)
 }
 
-/// Given a list of Message-IDs, returns the most relevant message found in the database.
+/// Given a list of Message-IDs, returns the latest message found in the database.
 ///
-/// Relevance here is `(download_state == Done, index)`, where `index` is an index of Message-ID in
-/// `mids`. This means Message-IDs should be ordered from the least late to the latest one (like in
-/// the References header).
 /// Only messages that are not in the trash chat are considered.
-pub(crate) async fn get_by_rfc724_mids(
+pub(crate) async fn get_latest_by_rfc724_mids(
     context: &Context,
     mids: &[String],
 ) -> Result<Option<Message>> {
-    let mut latest = None;
     for id in mids.iter().rev() {
-        let Some((msg_id, _)) = rfc724_mid_exists(context, id).await? else {
-            continue;
-        };
-        let Some(msg) = Message::load_from_db_optional(context, msg_id).await? else {
-            continue;
-        };
-        if msg.download_state == DownloadState::Done {
-            return Ok(Some(msg));
+        if let Some((msg_id, _)) = rfc724_mid_exists(context, id).await? {
+            if let Some(msg) = Message::load_from_db_optional(context, msg_id).await? {
+                return Ok(Some(msg));
+            }
         }
-        latest.get_or_insert(msg);
     }
-    Ok(latest)
-}
-
-/// Returns the 1st part of summary text (i.e. before the dash if any) for a valid DeltaChat vCard.
-pub(crate) fn get_vcard_summary(vcard: &[u8]) -> Option<String> {
-    let vcard = str::from_utf8(vcard).ok()?;
-    let contacts = deltachat_contact_tools::parse_vcard(vcard);
-    let [c] = &contacts[..] else {
-        return None;
-    };
-    if !deltachat_contact_tools::may_be_valid_addr(&c.addr) {
-        return None;
-    }
-    Some(c.display_name().to_string())
+    Ok(None)
 }
 
 /// How a message is primarily displayed.
@@ -2116,15 +2025,6 @@ impl Viewtype {
     }
 }
 
-/// Returns text for storing in the `msgs.txt_normalized` column (to make case-insensitive search
-/// possible for non-ASCII messages).
-pub(crate) fn normalize_text(text: &str) -> Option<String> {
-    if text.is_ascii() {
-        return None;
-    };
-    Some(text.to_lowercase()).filter(|t| t != text)
-}
-
 #[cfg(test)]
 mod tests {
     use num_traits::FromPrimitive;
@@ -2355,23 +2255,12 @@ mod tests {
         // Alice quotes encrypted message in unencrypted chat.
         let mut msg = Message::new(Viewtype::Text);
         msg.set_quote(alice, Some(&alice_received_message)).await?;
-        msg.set_text("unencrypted".to_string());
         chat::send_msg(alice, alice_group, &mut msg).await?;
 
         let bob_received_message = bob.recv_msg(&alice.pop_sent_msg().await).await;
         assert_eq!(bob_received_message.quoted_text().unwrap(), "...");
         assert_eq!(bob_received_message.get_showpadlock(), false);
 
-        // Alice replaces a quote of encrypted message with a quote of unencrypted one.
-        let mut msg1 = Message::new(Viewtype::Text);
-        msg1.set_quote(alice, Some(&alice_received_message)).await?;
-        msg1.set_quote(alice, Some(&msg)).await?;
-        chat::send_msg(alice, alice_group, &mut msg1).await?;
-
-        let bob_received_message = bob.recv_msg(&alice.pop_sent_msg().await).await;
-        assert_eq!(bob_received_message.quoted_text().unwrap(), "unencrypted");
-        assert_eq!(bob_received_message.get_showpadlock(), false);
-
         Ok(())
     }
 

src/mimeparser.rs

@@ -6,12 +6,11 @@ use std::path::Path;
 use std::str;
 
 use anyhow::{bail, Context as _, Result};
-use deltachat_contact_tools::{addr_cmp, addr_normalize, sanitize_bidi_characters};
+use deltachat_contact_tools::{addr_cmp, addr_normalize, strip_rtlo_characters};
 use deltachat_derive::{FromSql, ToSql};
 use format_flowed::unformat_flowed;
 use lettre_email::mime::Mime;
 use mailparse::{addrparse_header, DispositionType, MailHeader, MailHeaderMap, SingleInfo};
-use rand::distributions::{Alphanumeric, DistString};
 
 use crate::aheader::{Aheader, EncryptPreference};
 use crate::blob::BlobObject;
@@ -29,8 +28,7 @@ use crate::events::EventType;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
 use crate::key::{self, load_self_secret_keyring, DcKey, Fingerprint, SignedPublicKey};
 use crate::message::{
-    self, get_vcard_summary, set_msg_failed, update_msg_state, Message, MessageState, MsgId,
-    Viewtype,
+    self, set_msg_failed, update_msg_state, Message, MessageState, MsgId, Viewtype,
 };
 use crate::param::{Param, Params};
 use crate::peerstate::Peerstate;
@@ -221,8 +219,13 @@ impl MimeMessage {
         let mail = mailparse::parse_mail(body)?;
 
         let timestamp_rcvd = smeared_time(context);
-        let mut timestamp_sent =
-            Self::get_timestamp_sent(&mail.headers, timestamp_rcvd, timestamp_rcvd);
+        let timestamp_sent = mail
+            .headers
+            .get_header_value(HeaderDef::Date)
+            .and_then(|v| mailparse::dateparse(&v).ok())
+            .map_or(timestamp_rcvd, |value| {
+                min(value, timestamp_rcvd + constants::TIMESTAMP_SENT_TOLERANCE)
+            });
         let mut hop_info = parse_receive_headers(&mail.get_headers());
 
         let mut headers = Default::default();
@@ -250,8 +253,6 @@ impl MimeMessage {
                     // We don't remove "subject" from `headers` because currently just signed
                     // messages are shown as unencrypted anyway.
 
-                    timestamp_sent =
-                        Self::get_timestamp_sent(&mail.headers, timestamp_sent, timestamp_rcvd);
                     MimeMessage::merge_headers(
                         context,
                         &mut headers,
@@ -301,7 +302,7 @@ impl MimeMessage {
         // them in signed-only emails, but has no value currently.
         Self::remove_secured_headers(&mut headers);
 
-        let mut from = from.context("No from in message")?;
+        let from = from.context("No from in message")?;
         let private_keyring = load_self_secret_keyring(context).await?;
 
         let mut decryption_info =
@@ -347,8 +348,6 @@ impl MimeMessage {
             content
         });
         if let (Ok(mail), true) = (mail, encrypted) {
-            timestamp_sent =
-                Self::get_timestamp_sent(&mail.headers, timestamp_sent, timestamp_rcvd);
             if !signatures.is_empty() {
                 // Handle any gossip headers if the mail was encrypted. See section
                 // "3.6 Key Gossip" of <https://autocrypt.org/autocrypt-spec-1.1.0.pdf>
@@ -396,10 +395,12 @@ impl MimeMessage {
                 &mail.headers,
             );
 
-            if let Some(inner_from) = inner_from {
-                if !addr_cmp(&inner_from.addr, &from.addr) {
-                    // There is a From: header in the encrypted
-                    // part, but it doesn't match the outer one.
+            if let (Some(inner_from), true) = (inner_from, !signatures.is_empty()) {
+                if addr_cmp(&inner_from.addr, &from.addr) {
+                    from_is_signed = true;
+                } else {
+                    // There is a From: header in the encrypted &
+                    // signed part, but it doesn't match the outer one.
                     // This _might_ be because the sender's mail server
                     // replaced the sending address, e.g. in a mailing list.
                     // Or it's because someone is doing some replay attack.
@@ -408,7 +409,7 @@ impl MimeMessage {
                     // so we return an error below.
                     warn!(
                         context,
-                        "From header in encrypted part doesn't match the outer one",
+                        "From header in signed part doesn't match the outer one",
                     );
 
                     // Return an error from the parser.
@@ -417,8 +418,6 @@ impl MimeMessage {
                     // as if the MIME structure is broken.
                     bail!("From header is forged");
                 }
-                from = inner_from;
-                from_is_signed = !signatures.is_empty();
             }
         }
         if signatures.is_empty() {
@@ -524,18 +523,6 @@ impl MimeMessage {
         Ok(parser)
     }
 
-    fn get_timestamp_sent(
-        hdrs: &[mailparse::MailHeader<'_>],
-        default: i64,
-        timestamp_rcvd: i64,
-    ) -> i64 {
-        hdrs.get_header_value(HeaderDef::Date)
-            .and_then(|v| mailparse::dateparse(&v).ok())
-            .map_or(default, |value| {
-                min(value, timestamp_rcvd + constants::TIMESTAMP_SENT_TOLERANCE)
-            })
-    }
-
     /// Parses system messages.
     fn parse_system_message_headers(&mut self, context: &Context) {
         if self.get_header(HeaderDef::AutocryptSetupMessage).is_some() && !self.incoming {
@@ -785,15 +772,7 @@ impl MimeMessage {
             .collect::<String>()
             .strip_prefix("base64:")
         {
-            // Add random suffix to the filename
-            // to prevent the UI from accidentally using
-            // cached "avatar.jpg".
-            let suffix = Alphanumeric
-                .sample_string(&mut rand::thread_rng(), 7)
-                .to_lowercase();
-
-            match BlobObject::store_from_base64(context, base64, &format!("avatar-{suffix}")).await
-            {
+            match BlobObject::store_from_base64(context, base64, "avatar").await {
                 Ok(path) => Some(AvatarAction::Change(path)),
                 Err(err) => {
                     warn!(
@@ -1254,7 +1233,6 @@ impl MimeMessage {
                 return Ok(());
             }
         }
-        let mut part = Part::default();
         let msg_type = if context
             .is_webxdc_file(filename, decoded_data)
             .await
@@ -1298,13 +1276,6 @@ impl MimeMessage {
                 .unwrap_or_default();
             self.webxdc_status_update = Some(serialized);
             return Ok(());
-        } else if msg_type == Viewtype::Vcard {
-            if let Some(summary) = get_vcard_summary(decoded_data) {
-                part.param.set(Param::Summary1, summary);
-                msg_type
-            } else {
-                Viewtype::File
-            }
         } else {
             msg_type
         };
@@ -1324,6 +1295,8 @@ impl MimeMessage {
         };
         info!(context, "added blobfile: {:?}", blob.as_name());
 
+        /* create and register Mime part referencing the new Blob object */
+        let mut part = Part::default();
         if mime_type.type_() == mime::IMAGE {
             if let Ok((width, height)) = get_filemeta(decoded_data) {
                 part.param.set_int(Param::Width, width as i32);
@@ -1955,10 +1928,7 @@ pub struct Part {
     pub(crate) is_reaction: bool,
 }
 
-/// Returns the mimetype and viewtype for a parsed mail.
-///
-/// This only looks at the metadata, not at the content;
-/// the viewtype may later be corrected in `do_add_single_file_part()`.
+/// return mimetype and viewtype for a parsed mail
 fn get_mime_type(
     mail: &mailparse::ParsedMail<'_>,
     filename: &Option<String>,
@@ -1967,7 +1937,7 @@ fn get_mime_type(
 
     let viewtype = match mimetype.type_() {
         mime::TEXT => match mimetype.subtype() {
-            mime::VCARD => Viewtype::Vcard,
+            mime::VCARD if is_valid_deltachat_vcard(mail) => Viewtype::Vcard,
             mime::PLAIN | mime::HTML if !is_attachment_disposition(mail) => Viewtype::Text,
             _ => Viewtype::File,
         },
@@ -2018,6 +1988,17 @@ fn is_attachment_disposition(mail: &mailparse::ParsedMail<'_>) -> bool {
             .any(|(key, _value)| key.starts_with("filename"))
 }
 
+fn is_valid_deltachat_vcard(mail: &mailparse::ParsedMail) -> bool {
+    let Ok(body) = &mail.get_body() else {
+        return false;
+    };
+    let contacts = deltachat_contact_tools::parse_vcard(body);
+    if let [c] = &contacts[..] {
+        return deltachat_contact_tools::may_be_valid_addr(&c.addr);
+    }
+    false
+}
+
 /// Tries to get attachment filename.
 ///
 /// If filename is explicitly specified in Content-Disposition, it is
@@ -2067,7 +2048,7 @@ fn get_attachment_filename(
         };
     }
 
-    let desired_filename = desired_filename.map(|filename| sanitize_bidi_characters(&filename));
+    let desired_filename = desired_filename.map(|filename| strip_rtlo_characters(&filename));
 
     Ok(desired_filename)
 }

src/net.rs

@@ -1,66 +1,214 @@
 //! # Common network utilities.
-use std::net::SocketAddr;
+use std::net::{IpAddr, SocketAddr};
+use std::net::{Ipv4Addr, Ipv6Addr};
 use std::pin::Pin;
+use std::str::FromStr;
 use std::time::Duration;
 
 use anyhow::{format_err, Context as _, Result};
-use async_native_tls::TlsStream;
-use tokio::net::TcpStream;
+use tokio::net::{lookup_host, TcpStream};
 use tokio::time::timeout;
 use tokio_io_timeout::TimeoutStream;
 
 use crate::context::Context;
+use crate::tools::time;
 
-pub(crate) mod dns;
 pub(crate) mod http;
 pub(crate) mod session;
 pub(crate) mod tls;
 
-use dns::lookup_host_with_cache;
 pub use http::{read_url, read_url_blob, Response as HttpResponse};
-use tls::wrap_tls;
 
-/// Connection, write and read timeout.
+async fn connect_tcp_inner(addr: SocketAddr, timeout_val: Duration) -> Result<TcpStream> {
+    let tcp_stream = timeout(timeout_val, TcpStream::connect(addr))
+        .await
+        .context("connection timeout")?
+        .context("connection failure")?;
+    Ok(tcp_stream)
+}
+
+async fn lookup_host_with_timeout(
+    hostname: &str,
+    port: u16,
+    timeout_val: Duration,
+) -> Result<Vec<SocketAddr>> {
+    let res = timeout(timeout_val, lookup_host((hostname, port)))
+        .await
+        .context("DNS lookup timeout")?
+        .context("DNS lookup failure")?;
+    Ok(res.collect())
+}
+
+/// Looks up hostname and port using DNS and updates the address resolution cache.
 ///
-/// This constant should be more than the largest expected RTT.
-pub(crate) const TIMEOUT: Duration = Duration::from_secs(60);
+/// If `load_cache` is true, appends cached results not older than 30 days to the end
+/// or entries from fallback cache if there are no cached addresses.
+async fn lookup_host_with_cache(
+    context: &Context,
+    hostname: &str,
+    port: u16,
+    timeout_val: Duration,
+    load_cache: bool,
+) -> Result<Vec<SocketAddr>> {
+    let now = time();
+    let mut resolved_addrs = match lookup_host_with_timeout(hostname, port, timeout_val).await {
+        Ok(res) => res,
+        Err(err) => {
+            warn!(
+                context,
+                "DNS resolution for {}:{} failed: {:#}.", hostname, port, err
+            );
+            Vec::new()
+        }
+    };
+
+    for addr in &resolved_addrs {
+        let ip_string = addr.ip().to_string();
+        if ip_string == hostname {
+            // IP address resolved into itself, not interesting to cache.
+            continue;
+        }
+
+        info!(context, "Resolved {}:{} into {}.", hostname, port, &addr);
+
+        // Update the cache.
+        context
+            .sql
+            .execute(
+                "INSERT INTO dns_cache
+                 (hostname, address, timestamp)
+                 VALUES (?, ?, ?)
+                 ON CONFLICT (hostname, address)
+                 DO UPDATE SET timestamp=excluded.timestamp",
+                (hostname, ip_string, now),
+            )
+            .await?;
+    }
+
+    if load_cache {
+        for cached_address in context
+            .sql
+            .query_map(
+                "SELECT address
+                 FROM dns_cache
+                 WHERE hostname = ?
+                 AND ? < timestamp + 30 * 24 * 3600
+                 ORDER BY timestamp DESC",
+                (hostname, now),
+                |row| {
+                    let address: String = row.get(0)?;
+                    Ok(address)
+                },
+                |rows| {
+                    rows.collect::<std::result::Result<Vec<_>, _>>()
+                        .map_err(Into::into)
+                },
+            )
+            .await?
+        {
+            match IpAddr::from_str(&cached_address) {
+                Ok(ip_addr) => {
+                    let addr = SocketAddr::new(ip_addr, port);
+                    if !resolved_addrs.contains(&addr) {
+                        resolved_addrs.push(addr);
+                    }
+                }
+                Err(err) => {
+                    warn!(
+                        context,
+                        "Failed to parse cached address {:?}: {:#}.", cached_address, err
+                    );
+                }
+            }
+        }
+
+        if resolved_addrs.is_empty() {
+            // Load hardcoded cache if everything else fails.
+            //
+            // See <https://support.delta.chat/t/no-dns-resolution-result/2778> and
+            // <https://github.com/deltachat/deltachat-core-rust/issues/4920> for reasons.
+            //
+            // In the future we may pre-resolve all provider database addresses
+            // and build them in.
+            match hostname {
+                "mail.sangham.net" => {
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0xc17, 0x798c, 0, 0, 0, 1)),
+                        port,
+                    ));
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V4(Ipv4Addr::new(159, 69, 186, 85)),
+                        port,
+                    ));
+                }
+                "nine.testrun.org" => {
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2)),
+                        port,
+                    ));
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236)),
+                        port,
+                    ));
+                }
+                "disroot.org" => {
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V4(Ipv4Addr::new(178, 21, 23, 139)),
+                        port,
+                    ));
+                }
+                "mail.riseup.net" => {
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V4(Ipv4Addr::new(198, 252, 153, 70)),
+                        port,
+                    ));
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V4(Ipv4Addr::new(198, 252, 153, 71)),
+                        port,
+                    ));
+                }
+                "imap.gmail.com" => {
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6c)),
+                        port,
+                    ));
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6d)),
+                        port,
+                    ));
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
+                        port,
+                    ));
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 108)),
+                        port,
+                    ));
+                }
+                "smtp.gmail.com" => {
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x4013, 0xc04, 0, 0, 0, 0x6c)),
+                        port,
+                    ));
+                    resolved_addrs.push(SocketAddr::new(
+                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
+                        port,
+                    ));
+                }
+                _ => {}
+            }
+        }
+    }
+
+    Ok(resolved_addrs)
+}
 
 /// Returns a TCP connection stream with read/write timeouts set
 /// and Nagle's algorithm disabled with `TCP_NODELAY`.
 ///
 /// `TCP_NODELAY` ensures writing to the stream always results in immediate sending of the packet
 /// to the network, which is important to reduce the latency of interactive protocols such as IMAP.
-pub(crate) async fn connect_tcp_inner(
-    addr: SocketAddr,
-) -> Result<Pin<Box<TimeoutStream<TcpStream>>>> {
-    let tcp_stream = timeout(TIMEOUT, TcpStream::connect(addr))
-        .await
-        .context("connection timeout")?
-        .context("connection failure")?;
-
-    // Disable Nagle's algorithm.
-    tcp_stream.set_nodelay(true)?;
-
-    let mut timeout_stream = TimeoutStream::new(tcp_stream);
-    timeout_stream.set_write_timeout(Some(TIMEOUT));
-    timeout_stream.set_read_timeout(Some(TIMEOUT));
-
-    Ok(Box::pin(timeout_stream))
-}
-
-/// Attempts to establish TLS connection
-/// given the result of the hostname to address resolution.
-pub(crate) async fn connect_tls_inner(
-    addr: SocketAddr,
-    host: &str,
-    strict_tls: bool,
-    alpn: &str,
-) -> Result<TlsStream<Pin<Box<TimeoutStream<TcpStream>>>>> {
-    let tcp_stream = connect_tcp_inner(addr).await?;
-    let tls_stream = wrap_tls(strict_tls, host, alpn, tcp_stream).await?;
-    Ok(tls_stream)
-}
-
+///
 /// If `load_cache` is true, may use cached DNS results.
 /// Because the cache may be poisoned with incorrect results by networks hijacking DNS requests,
 /// this option should only be used when connection is authenticated,
@@ -71,24 +219,57 @@ pub(crate) async fn connect_tcp(
     context: &Context,
     host: &str,
     port: u16,
+    timeout_val: Duration,
     load_cache: bool,
 ) -> Result<Pin<Box<TimeoutStream<TcpStream>>>> {
-    let mut first_error = None;
+    let mut tcp_stream = None;
+    let mut last_error = None;
 
-    for resolved_addr in lookup_host_with_cache(context, host, port, load_cache).await? {
-        match connect_tcp_inner(resolved_addr).await {
+    for resolved_addr in
+        lookup_host_with_cache(context, host, port, timeout_val, load_cache).await?
+    {
+        match connect_tcp_inner(resolved_addr, timeout_val).await {
             Ok(stream) => {
-                return Ok(stream);
+                tcp_stream = Some(stream);
+
+                // Maximize priority of this cached entry.
+                context
+                    .sql
+                    .execute(
+                        "UPDATE dns_cache
+                         SET timestamp = ?
+                         WHERE address = ?",
+                        (time(), resolved_addr.ip().to_string()),
+                    )
+                    .await?;
+                break;
             }
             Err(err) => {
                 warn!(
                     context,
                     "Failed to connect to {}: {:#}.", resolved_addr, err
                 );
-                first_error.get_or_insert(err);
+                last_error = Some(err);
             }
         }
     }
 
-    Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
+    let tcp_stream = match tcp_stream {
+        Some(tcp_stream) => tcp_stream,
+        None => {
+            return Err(
+                last_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}"))
+            );
+        }
+    };
+
+    // Disable Nagle's algorithm.
+    tcp_stream.set_nodelay(true)?;
+
+    let mut timeout_stream = TimeoutStream::new(tcp_stream);
+    timeout_stream.set_write_timeout(Some(timeout_val));
+    timeout_stream.set_read_timeout(Some(timeout_val));
+    let pinned_stream = Box::pin(timeout_stream);
+
+    Ok(pinned_stream)
 }

src/net/dns.rs

@@ -1,217 +0,0 @@
-//! DNS resolution and cache.
-
-use anyhow::{Context as _, Result};
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
-use std::str::FromStr;
-use tokio::net::lookup_host;
-use tokio::time::timeout;
-
-use crate::context::Context;
-use crate::tools::time;
-
-async fn lookup_host_with_timeout(hostname: &str, port: u16) -> Result<Vec<SocketAddr>> {
-    let res = timeout(super::TIMEOUT, lookup_host((hostname, port)))
-        .await
-        .context("DNS lookup timeout")?
-        .context("DNS lookup failure")?;
-    Ok(res.collect())
-}
-
-// Updates timestamp of the cached entry
-// or inserts a new one if cached entry does not exist.
-//
-// This function should be called when a successful TLS
-// connection is established with strict TLS checks.
-//
-// This increases priority of existing cached entries
-// and copies fallback addresses from built-in cache
-// into database cache on successful use.
-//
-// Unlike built-in cache,
-// database cache is used even if DNS
-// resolver returns a non-empty
-// (but potentially incorrect and unusable) result.
-pub(crate) async fn update_connect_timestamp(
-    context: &Context,
-    host: &str,
-    address: &str,
-) -> Result<()> {
-    if host == address {
-        return Ok(());
-    }
-
-    context
-        .sql
-        .execute(
-            "INSERT INTO dns_cache (hostname, address, timestamp)
-                 VALUES (?, ?, ?)
-                 ON CONFLICT (hostname, address)
-                 DO UPDATE SET timestamp=excluded.timestamp",
-            (host, address, time()),
-        )
-        .await?;
-    Ok(())
-}
-
-/// Looks up hostname and port using DNS and updates the address resolution cache.
-///
-/// If `load_cache` is true, appends cached results not older than 30 days to the end
-/// or entries from fallback cache if there are no cached addresses.
-pub(crate) async fn lookup_host_with_cache(
-    context: &Context,
-    hostname: &str,
-    port: u16,
-    load_cache: bool,
-) -> Result<Vec<SocketAddr>> {
-    let now = time();
-    let mut resolved_addrs = match lookup_host_with_timeout(hostname, port).await {
-        Ok(res) => res,
-        Err(err) => {
-            warn!(
-                context,
-                "DNS resolution for {hostname}:{port} failed: {err:#}."
-            );
-            Vec::new()
-        }
-    };
-
-    for addr in &resolved_addrs {
-        let ip_string = addr.ip().to_string();
-        if ip_string == hostname {
-            // IP address resolved into itself, not interesting to cache.
-            continue;
-        }
-
-        info!(context, "Resolved {}:{} into {}.", hostname, port, &addr);
-
-        // Update the cache.
-        context
-            .sql
-            .execute(
-                "INSERT INTO dns_cache
-                 (hostname, address, timestamp)
-                 VALUES (?, ?, ?)
-                 ON CONFLICT (hostname, address)
-                 DO UPDATE SET timestamp=excluded.timestamp",
-                (hostname, ip_string, now),
-            )
-            .await?;
-    }
-
-    if load_cache {
-        for cached_address in context
-            .sql
-            .query_map(
-                "SELECT address
-                 FROM dns_cache
-                 WHERE hostname = ?
-                 AND ? < timestamp + 30 * 24 * 3600
-                 ORDER BY timestamp DESC",
-                (hostname, now),
-                |row| {
-                    let address: String = row.get(0)?;
-                    Ok(address)
-                },
-                |rows| {
-                    rows.collect::<std::result::Result<Vec<_>, _>>()
-                        .map_err(Into::into)
-                },
-            )
-            .await?
-        {
-            match IpAddr::from_str(&cached_address) {
-                Ok(ip_addr) => {
-                    let addr = SocketAddr::new(ip_addr, port);
-                    if !resolved_addrs.contains(&addr) {
-                        resolved_addrs.push(addr);
-                    }
-                }
-                Err(err) => {
-                    warn!(
-                        context,
-                        "Failed to parse cached address {:?}: {:#}.", cached_address, err
-                    );
-                }
-            }
-        }
-
-        if resolved_addrs.is_empty() {
-            // Load hardcoded cache if everything else fails.
-            //
-            // See <https://support.delta.chat/t/no-dns-resolution-result/2778> and
-            // <https://github.com/deltachat/deltachat-core-rust/issues/4920> for reasons.
-            //
-            // In the future we may pre-resolve all provider database addresses
-            // and build them in.
-            match hostname {
-                "mail.sangham.net" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0xc17, 0x798c, 0, 0, 0, 1)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(159, 69, 186, 85)),
-                        port,
-                    ));
-                }
-                "nine.testrun.org" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236)),
-                        port,
-                    ));
-                }
-                "disroot.org" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(178, 21, 23, 139)),
-                        port,
-                    ));
-                }
-                "mail.riseup.net" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(198, 252, 153, 70)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(198, 252, 153, 71)),
-                        port,
-                    ));
-                }
-                "imap.gmail.com" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6c)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6d)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 108)),
-                        port,
-                    ));
-                }
-                "smtp.gmail.com" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x4013, 0xc04, 0, 0, 0, 0x6c)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
-                        port,
-                    ));
-                }
-                _ => {}
-            }
-        }
-    }
-
-    Ok(resolved_addrs)
-}

src/net/http.rs

@@ -1,15 +1,16 @@
 //! # HTTP module.
 
-use std::sync::Arc;
+use std::time::Duration;
 
 use anyhow::{anyhow, Result};
 use mime::Mime;
 use once_cell::sync::Lazy;
 
 use crate::context::Context;
-use crate::net::lookup_host_with_cache;
 use crate::socks::Socks5Config;
 
+const HTTP_TIMEOUT: Duration = Duration::from_secs(30);
+
 static LETSENCRYPT_ROOT: Lazy<reqwest::tls::Certificate> = Lazy::new(|| {
     reqwest::tls::Certificate::from_der(include_bytes!(
         "../../assets/root-certificates/letsencrypt/isrgrootx1.der"
@@ -23,7 +24,7 @@ pub struct Response {
     /// Response body.
     pub blob: Vec<u8>,
 
-    /// MIME type extracted from the `Content-Type` header, if any.
+    /// MIME type exntracted from the `Content-Type` header, if any.
     pub mimetype: Option<String>,
 
     /// Encoding extracted from the `Content-Type` header, if any.
@@ -59,13 +60,8 @@ pub async fn read_url_blob(context: &Context, url: &str) -> Result<Response> {
 }
 
 async fn read_url_inner(context: &Context, url: &str) -> Result<reqwest::Response> {
-    // It is safe to use cached IP addresses
-    // for HTTPS URLs, but for HTTP URLs
-    // better resolve from scratch each time to prevent
-    // cache poisoning attacks from having lasting effects.
-    let load_cache = url.starts_with("https://");
-
-    let client = get_client(context, load_cache).await?;
+    let socks5_config = Socks5Config::from_database(&context.sql).await?;
+    let client = get_client(socks5_config)?;
     let mut url = url.to_string();
 
     // Follow up to 10 http-redirects
@@ -90,56 +86,10 @@ async fn read_url_inner(context: &Context, url: &str) -> Result<reqwest::Respons
     Err(anyhow!("Followed 10 redirections"))
 }
 
-struct CustomResolver {
-    context: Context,
-
-    /// Whether to return cached results or not.
-    /// If resolver can be used for URLs
-    /// without TLS, e.g. HTTP URLs from HTML email,
-    /// this must be false. If TLS is used
-    /// and certificate hostnames are checked,
-    /// it is safe to load cache.
-    load_cache: bool,
-}
-
-impl CustomResolver {
-    fn new(context: Context, load_cache: bool) -> Self {
-        Self {
-            context,
-            load_cache,
-        }
-    }
-}
-
-impl reqwest::dns::Resolve for CustomResolver {
-    fn resolve(&self, hostname: reqwest::dns::Name) -> reqwest::dns::Resolving {
-        let context = self.context.clone();
-        let load_cache = self.load_cache;
-        Box::pin(async move {
-            let port = 443; // Actual port does not matter.
-
-            let socket_addrs =
-                lookup_host_with_cache(&context, hostname.as_str(), port, load_cache).await;
-            match socket_addrs {
-                Ok(socket_addrs) => {
-                    let addrs: reqwest::dns::Addrs = Box::new(socket_addrs.into_iter());
-
-                    Ok(addrs)
-                }
-                Err(err) => Err(err.into()),
-            }
-        })
-    }
-}
-
-pub(crate) async fn get_client(context: &Context, load_cache: bool) -> Result<reqwest::Client> {
-    let socks5_config = Socks5Config::from_database(&context.sql).await?;
-    let resolver = Arc::new(CustomResolver::new(context.clone(), load_cache));
-
+pub(crate) fn get_client(socks5_config: Option<Socks5Config>) -> Result<reqwest::Client> {
     let builder = reqwest::ClientBuilder::new()
-        .timeout(super::TIMEOUT)
-        .add_root_certificate(LETSENCRYPT_ROOT.clone())
-        .dns_resolver(resolver);
+        .timeout(HTTP_TIMEOUT)
+        .add_root_certificate(LETSENCRYPT_ROOT.clone());
 
     let builder = if let Some(socks5_config) = socks5_config {
         let proxy = reqwest::Proxy::all(socks5_config.to_url())?;

src/net/tls.rs

@@ -14,10 +14,9 @@ static LETSENCRYPT_ROOT: Lazy<Certificate> = Lazy::new(|| {
     .unwrap()
 });
 
-pub fn build_tls(strict_tls: bool, alpns: &[&str]) -> TlsConnector {
+pub fn build_tls(strict_tls: bool) -> TlsConnector {
     let tls_builder = TlsConnector::new()
         .min_protocol_version(Some(Protocol::Tlsv12))
-        .request_alpns(alpns)
         .add_root_certificate(LETSENCRYPT_ROOT.clone());
 
     if strict_tls {
@@ -32,10 +31,9 @@ pub fn build_tls(strict_tls: bool, alpns: &[&str]) -> TlsConnector {
 pub async fn wrap_tls<T: AsyncRead + AsyncWrite + Unpin>(
     strict_tls: bool,
     hostname: &str,
-    alpn: &str,
     stream: T,
 ) -> Result<TlsStream<T>> {
-    let tls = build_tls(strict_tls, &[alpn]);
+    let tls = build_tls(strict_tls);
     let tls_stream = tls.connect(hostname, stream).await?;
     Ok(tls_stream)
 }
@@ -48,7 +46,7 @@ mod tests {
     fn test_build_tls() {
         // we are using some additional root certificates.
         // make sure, they do not break construction of TlsConnector
-        let _ = build_tls(true, &[]);
-        let _ = build_tls(false, &[]);
+        let _ = build_tls(true);
+        let _ = build_tls(false);
     }
 }

src/oauth2.rs

@@ -10,6 +10,7 @@ use crate::config::Config;
 use crate::context::Context;
 use crate::provider;
 use crate::provider::Oauth2Authorizer;
+use crate::socks::Socks5Config;
 use crate::tools::time;
 
 const OAUTH2_GMAIL: Oauth2 = Oauth2 {
@@ -158,12 +159,8 @@ pub(crate) async fn get_oauth2_access_token(
         }
 
         // ... and POST
-
-        // All OAuth URLs are hardcoded HTTPS URLs,
-        // so it is safe to load DNS cache.
-        let load_cache = true;
-
-        let client = crate::net::http::get_client(context, load_cache).await?;
+        let socks5_config = Socks5Config::from_database(&context.sql).await?;
+        let client = crate::net::http::get_client(socks5_config)?;
 
         let response: Response = match client.post(post_url).form(&post_param).send().await {
             Ok(resp) => match resp.json().await {
@@ -293,12 +290,8 @@ impl Oauth2 {
         //   "verified_email": true,
         //   "picture": "https://lh4.googleusercontent.com/-Gj5jh_9R0BY/AAAAAAAAAAI/AAAAAAAAAAA/IAjtjfjtjNA/photo.jpg"
         // }
-
-        // All OAuth URLs are hardcoded HTTPS URLs,
-        // so it is safe to load DNS cache.
-        let load_cache = true;
-
-        let client = match crate::net::http::get_client(context, load_cache).await {
+        let socks5_config = Socks5Config::from_database(&context.sql).await.ok()?;
+        let client = match crate::net::http::get_client(socks5_config) {
             Ok(cl) => cl,
             Err(err) => {
                 warn!(context, "failed to get HTTP client: {}", err);

src/param.rs

@@ -88,9 +88,6 @@ pub enum Param {
     /// For Messages: quoted text.
     Quote = b'q',
 
-    /// For Messages: the 1st part of summary text (i.e. before the dash if any).
-    Summary1 = b'4',
-
     /// For Messages
     Cmd = b'S',
 

src/peer_channels.rs

@@ -25,12 +25,10 @@
 
 use anyhow::{anyhow, Context as _, Result};
 use email::Header;
-use futures_lite::StreamExt;
 use iroh_gossip::net::{Gossip, JoinTopicFut, GOSSIP_ALPN};
 use iroh_gossip::proto::{Event as IrohEvent, TopicId};
-use iroh_net::key::{PublicKey, SecretKey};
 use iroh_net::relay::{RelayMap, RelayUrl};
-use iroh_net::{relay::RelayMode, Endpoint};
+use iroh_net::{key::SecretKey, relay::RelayMode, Endpoint};
 use iroh_net::{NodeAddr, NodeId};
 use std::collections::{BTreeSet, HashMap};
 use std::env;
@@ -62,10 +60,8 @@ pub struct Iroh {
     /// Topics for which an advertisement has already been sent.
     pub(crate) iroh_channels: RwLock<HashMap<TopicId, ChannelState>>,
 
-    /// Currently used Iroh public key.
-    ///
-    /// This is attached to every message to work around `iroh_gossip` deduplication.
-    pub(crate) public_key: PublicKey,
+    /// Currently used Iroh secret key
+    pub(crate) secret_key: SecretKey,
 }
 
 impl Iroh {
@@ -84,9 +80,7 @@ impl Iroh {
         ctx: &Context,
         msg_id: MsgId,
     ) -> Result<Option<JoinTopicFut>> {
-        let topic = get_iroh_topic_for_msg(ctx, msg_id)
-            .await?
-            .with_context(|| format!("Message {msg_id} has no gossip topic"))?;
+        let topic = get_iroh_topic_for_msg(ctx, msg_id).await?;
 
         // Take exclusive lock to make sure
         // no other thread can create a second gossip subscription
@@ -104,22 +98,21 @@ impl Iroh {
         };
 
         let peers = get_iroh_gossip_peers(ctx, msg_id).await?;
-        let node_ids = peers.iter().map(|p| p.node_id).collect::<Vec<_>>();
-
         info!(
             ctx,
-            "IROH_REALTIME: Joining gossip with peers: {:?}", node_ids,
+            "IROH_REALTIME: Joining gossip with peers: {:?}",
+            peers.iter().map(|p| p.node_id).collect::<Vec<_>>()
         );
 
-        // Inform iroh of potentially new node addresses
-        for node_addr in &peers {
-            if !node_addr.info.is_empty() {
-                self.endpoint.add_node_addr(node_addr.clone())?;
-            }
+        // Connect to all peers
+        for peer in &peers {
+            self.endpoint.add_node_addr(peer.clone())?;
         }
 
-        // Connect to all peers
-        let connect_future = self.gossip.join(topic, node_ids).await?;
+        let connect_future = self
+            .gossip
+            .join(topic, peers.into_iter().map(|addr| addr.node_id).collect())
+            .await?;
 
         let ctx = ctx.clone();
         let gossip = self.gossip.clone();
@@ -156,14 +149,12 @@ impl Iroh {
         msg_id: MsgId,
         mut data: Vec<u8>,
     ) -> Result<()> {
-        let topic = get_iroh_topic_for_msg(ctx, msg_id)
-            .await?
-            .with_context(|| format!("Message {msg_id} has no gossip topic"))?;
+        let topic = get_iroh_topic_for_msg(ctx, msg_id).await?;
         self.join_and_subscribe_gossip(ctx, msg_id).await?;
 
         let seq_num = self.get_and_incr(&topic).await;
         data.extend(seq_num.to_le_bytes());
-        data.extend(self.public_key.as_bytes());
+        data.extend(self.secret_key.public().as_bytes());
 
         self.gossip.broadcast(topic, data.into()).await?;
 
@@ -185,7 +176,7 @@ impl Iroh {
 
     /// Get the iroh [NodeAddr] without direct IP addresses.
     pub(crate) async fn get_node_addr(&self) -> Result<NodeAddr> {
-        let mut addr = self.endpoint.node_addr().await?;
+        let mut addr = self.endpoint.my_addr().await?;
         addr.info.direct_addresses = BTreeSet::new();
         Ok(addr)
     }
@@ -221,10 +212,9 @@ impl ChannelState {
 }
 
 impl Context {
-    /// Create iroh endpoint and gossip.
+    /// Create magic endpoint and gossip.
     async fn init_peer_channels(&self) -> Result<Iroh> {
-        let secret_key = SecretKey::generate();
-        let public_key = secret_key.public();
+        let secret_key: SecretKey = SecretKey::generate();
 
         let relay_mode = if let Some(relay_url) = self
             .metadata
@@ -241,14 +231,14 @@ impl Context {
         };
 
         let endpoint = Endpoint::builder()
-            .secret_key(secret_key)
+            .secret_key(secret_key.clone())
             .alpns(vec![GOSSIP_ALPN.to_vec()])
             .relay_mode(relay_mode)
             .bind(0)
             .await?;
 
         // create gossip
-        let my_addr = endpoint.node_addr().await?;
+        let my_addr = endpoint.my_addr().await?;
         let gossip = Gossip::from_endpoint(endpoint.clone(), Default::default(), &my_addr.info);
 
         // spawn endpoint loop that forwards incoming connections to the gossiper
@@ -256,13 +246,12 @@ impl Context {
 
         // Shuts down on deltachat shutdown
         tokio::spawn(endpoint_loop(context, endpoint.clone(), gossip.clone()));
-        tokio::spawn(gossip_direct_address_loop(endpoint.clone(), gossip.clone()));
 
         Ok(Iroh {
             endpoint,
             gossip,
             iroh_channels: RwLock::new(HashMap::new()),
-            public_key,
+            secret_key,
         })
     }
 
@@ -275,15 +264,6 @@ impl Context {
     }
 }
 
-/// Loop to update direct addresses of the gossip.
-async fn gossip_direct_address_loop(endpoint: Endpoint, gossip: Gossip) -> Result<()> {
-    let mut stream = endpoint.direct_addresses();
-    while let Some(addrs) = stream.next().await {
-        gossip.update_direct_addresses(&addrs)?;
-    }
-    Ok(())
-}
-
 /// Cache a peers [NodeId] for one topic.
 pub(crate) async fn iroh_add_peer_for_topic(
     ctx: &Context,
@@ -341,28 +321,16 @@ async fn get_iroh_gossip_peers(ctx: &Context, msg_id: MsgId) -> Result<Vec<NodeA
 }
 
 /// Get the topic for a given [MsgId].
-pub(crate) async fn get_iroh_topic_for_msg(
-    ctx: &Context,
-    msg_id: MsgId,
-) -> Result<Option<TopicId>> {
-    if let Some(bytes) = ctx
+pub(crate) async fn get_iroh_topic_for_msg(ctx: &Context, msg_id: MsgId) -> Result<TopicId> {
+    let bytes: Vec<u8> = ctx
         .sql
-        .query_get_value::<Vec<u8>>(
+        .query_get_value(
             "SELECT topic FROM iroh_gossip_peers WHERE msg_id = ? LIMIT 1",
             (msg_id,),
         )
-        .await
-        .context("Couldn't restore topic from db")?
-    {
-        let topic_id = TopicId::from_bytes(
-            bytes
-                .try_into()
-                .map_err(|_| anyhow!("Could not convert stored topic ID"))?,
-        );
-        Ok(Some(topic_id))
-    } else {
-        Ok(None)
-    }
+        .await?
+        .context("couldn't restore topic from db")?;
+    Ok(TopicId::from_bytes(bytes.try_into().unwrap()))
 }
 
 /// Send a gossip advertisement to the chat that [MsgId] belongs to.
@@ -404,11 +372,10 @@ pub async fn leave_webxdc_realtime(ctx: &Context, msg_id: MsgId) -> Result<()> {
     if !ctx.get_config_bool(Config::WebxdcRealtimeEnabled).await? {
         return Ok(());
     }
-    let topic = get_iroh_topic_for_msg(ctx, msg_id)
-        .await?
-        .with_context(|| format!("Message {msg_id} has no gossip topic"))?;
+
     let iroh = ctx.get_or_try_init_peer_channel().await?;
-    iroh.leave_realtime(topic).await?;
+    iroh.leave_realtime(get_iroh_topic_for_msg(ctx, msg_id).await?)
+        .await?;
     info!(ctx, "IROH_REALTIME: Left gossip for message {msg_id}");
 
     Ok(())
@@ -452,11 +419,11 @@ async fn handle_connection(
     let conn = conn.await?;
     let peer_id = iroh_net::endpoint::get_remote_node_id(&conn)?;
 
-    match alpn.as_slice() {
+    match alpn.as_bytes() {
         GOSSIP_ALPN => gossip
             .handle_connection(conn)
             .await
-            .context(format!("Gossip connection to {peer_id} failed"))?,
+            .context(format!("Connection to {peer_id} with ALPN {alpn} failed"))?,
         _ => warn!(
             context,
             "Ignoring connection from {peer_id}: unsupported ALPN protocol"
@@ -781,7 +748,6 @@ mod tests {
         leave_webxdc_realtime(alice, alice_webxdc.id).await.unwrap();
         let topic = get_iroh_topic_for_msg(alice, alice_webxdc.id)
             .await
-            .unwrap()
             .unwrap();
         assert!(if let Some(state) = alice
             .iroh

src/pgp.rs

@@ -11,7 +11,6 @@ use pgp::composed::{
     Deserializable, KeyType as PgpKeyType, Message, SecretKeyParamsBuilder, SignedPublicKey,
     SignedPublicSubKey, SignedSecretKey, StandaloneSignature, SubkeyParamsBuilder,
 };
-use pgp::crypto::ecc_curve::ECCCurve;
 use pgp::crypto::hash::HashAlgorithm;
 use pgp::crypto::sym::SymmetricKeyAlgorithm;
 use pgp::types::{
@@ -116,14 +115,7 @@ pub fn split_armored_data(buf: &[u8]) -> Result<(BlockType, BTreeMap<String, Str
     let headers = dearmor
         .headers
         .into_iter()
-        .map(|(key, values)| {
-            (
-                key.trim().to_lowercase(),
-                values
-                    .last()
-                    .map_or_else(String::new, |s| s.trim().to_string()),
-            )
-        })
+        .map(|(key, value)| (key.trim().to_lowercase(), value.trim().to_string()))
         .collect();
 
     Ok((typ, headers, bytes))
@@ -153,9 +145,7 @@ pub(crate) fn create_keypair(addr: EmailAddress, keygen_type: KeyGenType) -> Res
     let (signing_key_type, encryption_key_type) = match keygen_type {
         KeyGenType::Rsa2048 => (PgpKeyType::Rsa(2048), PgpKeyType::Rsa(2048)),
         KeyGenType::Rsa4096 => (PgpKeyType::Rsa(4096), PgpKeyType::Rsa(4096)),
-        KeyGenType::Ed25519 | KeyGenType::Default => {
-            (PgpKeyType::EdDSA, PgpKeyType::ECDH(ECCCurve::Curve25519))
-        }
+        KeyGenType::Ed25519 | KeyGenType::Default => (PgpKeyType::EdDSA, PgpKeyType::ECDH),
     };
 
     let user_id = format!("<{addr}>");
@@ -272,7 +262,7 @@ pub async fn pk_encrypt(
                 lit_msg.encrypt_to_keys(&mut rng, SYMMETRIC_KEY_ALGORITHM, &pkeys_refs)?
             };
 
-            let encoded_msg = encrypted_msg.to_armored_string(Default::default())?;
+            let encoded_msg = encrypted_msg.to_armored_string(None)?;
 
             Ok(encoded_msg)
         })
@@ -289,7 +279,7 @@ pub fn pk_calc_signature(
         || "".into(),
         HASH_ALGORITHM,
     )?;
-    let signature = msg.into_signature().to_armored_string(Default::default())?;
+    let signature = msg.into_signature().to_armored_string(None)?;
     Ok(signature)
 }
 
@@ -314,26 +304,31 @@ pub fn pk_decrypt(
 
     let skeys: Vec<&SignedSecretKey> = private_keys_for_decryption.iter().collect();
 
-    let (msg, _) = msg.decrypt(|| "".into(), &skeys[..])?;
+    let (decryptor, _) = msg.decrypt(|| "".into(), &skeys[..])?;
+    let msgs = decryptor.collect::<pgp::errors::Result<Vec<_>>>()?;
 
-    // get_content() will decompress the message if needed,
-    // but this avoids decompressing it again to check signatures
-    let msg = msg.decompress()?;
+    if let Some(msg) = msgs.into_iter().next() {
+        // get_content() will decompress the message if needed,
+        // but this avoids decompressing it again to check signatures
+        let msg = msg.decompress()?;
 
-    let content = match msg.get_content()? {
-        Some(content) => content,
-        None => bail!("The decrypted message is empty"),
-    };
+        let content = match msg.get_content()? {
+            Some(content) => content,
+            None => bail!("The decrypted message is empty"),
+        };
 
-    if let signed_msg @ pgp::composed::Message::Signed { .. } = msg {
-        for pkey in public_keys_for_validation {
-            if signed_msg.verify(&pkey.primary_key).is_ok() {
-                let fp = DcKey::fingerprint(pkey);
-                ret_signature_fingerprints.insert(fp);
+        if let signed_msg @ pgp::composed::Message::Signed { .. } = msg {
+            for pkey in public_keys_for_validation {
+                if signed_msg.verify(&pkey.primary_key).is_ok() {
+                    let fp = DcKey::fingerprint(pkey);
+                    ret_signature_fingerprints.insert(fp);
+                }
             }
         }
+        Ok((content, ret_signature_fingerprints))
+    } else {
+        bail!("No valid messages found");
     }
-    Ok((content, ret_signature_fingerprints))
 }
 
 /// Validates detached signature.
@@ -373,7 +368,7 @@ pub async fn symm_encrypt(passphrase: &str, plain: &[u8]) -> Result<String> {
         let msg =
             lit_msg.encrypt_with_password(&mut rng, s2k, SYMMETRIC_KEY_ALGORITHM, || passphrase)?;
 
-        let encoded_msg = msg.to_armored_string(Default::default())?;
+        let encoded_msg = msg.to_armored_string(None)?;
 
         Ok(encoded_msg)
     })
@@ -389,11 +384,16 @@ pub async fn symm_decrypt<T: std::io::Read + std::io::Seek>(
 
     let passphrase = passphrase.to_string();
     tokio::task::spawn_blocking(move || {
-        let msg = enc_msg.decrypt_with_password(|| passphrase)?;
+        let decryptor = enc_msg.decrypt_with_password(|| passphrase)?;
 
-        match msg.get_content()? {
-            Some(content) => Ok(content),
-            None => bail!("Decrypted message is empty"),
+        let msgs = decryptor.collect::<pgp::errors::Result<Vec<_>>>()?;
+        if let Some(msg) = msgs.first() {
+            match msg.get_content()? {
+                Some(content) => Ok(content),
+                None => bail!("Decrypted message is empty"),
+            }
+        } else {
+            bail!("No valid messages found")
         }
     })
     .await?
@@ -410,7 +410,7 @@ mod tests {
     #[test]
     fn test_split_armored_data_1() {
         let (typ, _headers, base64) = split_armored_data(
-            b"-----BEGIN PGP MESSAGE-----\nNoVal:\n\naGVsbG8gd29ybGQ=\n-----END PGP MESSAGE-----",
+            b"-----BEGIN PGP MESSAGE-----\nNoVal:\n\naGVsbG8gd29ybGQ=\n-----END PGP MESSAGE----",
         )
         .unwrap();
 

src/provider/data.rs

@@ -66,34 +66,6 @@ static P_AKTIVIX_ORG: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// aliyun.md: aliyun.com
-static P_ALIYUN: Provider = Provider {
-    id: "aliyun",
-    status: Status::Ok,
-    before_login_hint: "",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/aliyun",
-    server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "imap.aliyun.com",
-            port: 993,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "smtp.aliyun.com",
-            port: 465,
-            username_pattern: Email,
-        },
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // aol.md: aol.com
 static P_AOL: Provider = Provider {
     id: "aol",
@@ -250,6 +222,99 @@ static P_BUZON_UY: Provider = Provider {
     oauth2_authorizer: None,
 };
 
+// c1.testrun.org.md: c1.testrun.org
+static P_C1_TESTRUN_ORG: Provider = Provider {
+    id: "c1.testrun.org",
+    status: Status::Ok,
+    before_login_hint: "",
+    after_login_hint: "",
+    overview_page: "https://providers.delta.chat/c1-testrun-org",
+    server: &[
+        Server {
+            protocol: Imap,
+            socket: Ssl,
+            hostname: "c1.testrun.org",
+            port: 993,
+            username_pattern: Email,
+        },
+        Server {
+            protocol: Smtp,
+            socket: Ssl,
+            hostname: "c1.testrun.org",
+            port: 465,
+            username_pattern: Email,
+        },
+    ],
+    opt: ProviderOptions::new(),
+    config_defaults: Some(&[ConfigDefault {
+        key: Config::MvboxMove,
+        value: "0",
+    }]),
+    oauth2_authorizer: None,
+};
+
+// c2.testrun.org.md: c2.testrun.org
+static P_C2_TESTRUN_ORG: Provider = Provider {
+    id: "c2.testrun.org",
+    status: Status::Ok,
+    before_login_hint: "",
+    after_login_hint: "",
+    overview_page: "https://providers.delta.chat/c2-testrun-org",
+    server: &[
+        Server {
+            protocol: Imap,
+            socket: Ssl,
+            hostname: "c2.testrun.org",
+            port: 993,
+            username_pattern: Email,
+        },
+        Server {
+            protocol: Smtp,
+            socket: Ssl,
+            hostname: "c2.testrun.org",
+            port: 465,
+            username_pattern: Email,
+        },
+    ],
+    opt: ProviderOptions::new(),
+    config_defaults: Some(&[ConfigDefault {
+        key: Config::MvboxMove,
+        value: "0",
+    }]),
+    oauth2_authorizer: None,
+};
+
+// c3.testrun.org.md: c3.testrun.org
+static P_C3_TESTRUN_ORG: Provider = Provider {
+    id: "c3.testrun.org",
+    status: Status::Ok,
+    before_login_hint: "",
+    after_login_hint: "",
+    overview_page: "https://providers.delta.chat/c3-testrun-org",
+    server: &[
+        Server {
+            protocol: Imap,
+            socket: Ssl,
+            hostname: "c3.testrun.org",
+            port: 993,
+            username_pattern: Email,
+        },
+        Server {
+            protocol: Smtp,
+            socket: Ssl,
+            hostname: "c3.testrun.org",
+            port: 465,
+            username_pattern: Email,
+        },
+    ],
+    opt: ProviderOptions::new(),
+    config_defaults: Some(&[ConfigDefault {
+        key: Config::MvboxMove,
+        value: "0",
+    }]),
+    oauth2_authorizer: None,
+};
+
 // chello.at.md: chello.at
 static P_CHELLO_AT: Provider = Provider {
     id: "chello.at",
@@ -291,48 +356,6 @@ static P_COMCAST: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// daleth.cafe.md: daleth.cafe
-static P_DALETH_CAFE: Provider = Provider {
-    id: "daleth.cafe",
-    status: Status::Ok,
-    before_login_hint: "",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/daleth-cafe",
-    server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "daleth.cafe",
-            port: 993,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "daleth.cafe",
-            port: 465,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Imap,
-            socket: Starttls,
-            hostname: "daleth.cafe",
-            port: 143,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Starttls,
-            hostname: "daleth.cafe",
-            port: 587,
-            username_pattern: Email,
-        },
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // dismail.de.md: dismail.de
 static P_DISMAIL_DE: Provider = Provider {
     id: "dismail.de",
@@ -359,14 +382,14 @@ static P_DISROOT: Provider = Provider {
             socket: Ssl,
             hostname: "disroot.org",
             port: 993,
-            username_pattern: Emaillocalpart,
+            username_pattern: Email,
         },
         Server {
             protocol: Smtp,
             socket: Starttls,
             hostname: "disroot.org",
             port: 587,
-            username_pattern: Emaillocalpart,
+            username_pattern: Email,
         },
     ],
     opt: ProviderOptions::new(),
@@ -423,7 +446,7 @@ static P_EXAMPLE_COM: Provider = Provider {
     after_login_hint: "This provider doesn't really exist, so you can't use it :/ If you need an email provider for Delta Chat, take a look at providers.delta.chat!",
     overview_page: "https://providers.delta.chat/example-com",
     server: &[
-        Server { protocol: Imap, socket: Ssl, hostname: "imap.example.com", port: 1337, username_pattern: Emaillocalpart },
+        Server { protocol: Imap, socket: Ssl, hostname: "imap.example.com", port: 1337, username_pattern: Email },
         Server { protocol: Smtp, socket: Starttls, hostname: "smtp.example.com", port: 1337, username_pattern: Email },
     ],
     opt: ProviderOptions::new(),
@@ -724,20 +747,6 @@ static P_KONTENT_COM: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// mail.com.md: email.com, groupmail.com, post.com, homemail.com, housemail.com, writeme.com, mail.com, mail-me.com, workmail.com, accountant.com, activist.com, adexec.com, allergist.com, alumni.com, alumnidirector.com, archaeologist.com, auctioneer.net, bartender.net, brew-master.com, chef.net, chemist.com, collector.org, columnist.com, comic.com, consultant.com, contractor.net, counsellor.com, deliveryman.com, diplomats.com, dr.com, engineer.com, financier.com, fireman.net, gardener.com, geologist.com, graphic-designer.com, graduate.org, hairdresser.net, instructor.net, insurer.com, journalist.com, legislator.com, lobbyist.com, minister.com, musician.org, optician.com, orthodontist.net, pediatrician.com, photographer.net, physicist.net, politician.com, presidency.com, priest.com, programmer.net, publicist.com, radiologist.net, realtyagent.com, registerednurses.com, repairman.com, representative.com, salesperson.net, secretary.net, socialworker.net, sociologist.com, songwriter.net, teachers.org, techie.com, technologist.com, therapist.net, umpire.com, worker.com, artlover.com, bikerider.com, birdlover.com, blader.com, kittymail.com, lovecat.com, marchmail.com, boardermail.com, catlover.com, clubmember.org, nonpartisan.com, petlover.com, doglover.com, greenmail.net, hackermail.com, theplate.com, bsdmail.com, computer4u.com, coolsite.net, cyberdude.com, cybergal.com, cyberservices.com, cyber-wizard.com, linuxmail.org, null.net, solution4u.com, tech-center.com, webname.com, acdcfan.com, angelic.com, discofan.com, elvisfan.com, hiphopfan.com, kissfans.com, madonnafan.com, metalfan.com, ninfan.com, ravemail.com, reggaefan.com, snakebite.com, bellair.net, californiamail.com, dallasmail.com, nycmail.com, pacific-ocean.com, pacificwest.com, sanfranmail.com, usa.com, africamail.com, asia-mail.com, australiamail.com, berlin.com, brazilmail.com, chinamail.com, dublin.com, dutchmail.com, englandmail.com, europe.com, arcticmail.com, europemail.com, germanymail.com, irelandmail.com, israelmail.com, italymail.com, koreamail.com, mexicomail.com, moscowmail.com, munich.com, asia.com, polandmail.com, safrica.com, samerica.com, scotlandmail.com, spainmail.com, swedenmail.com, swissmail.com, torontomail.com, aircraftmail.com, cash4u.com, disposable.com, execs.com, fastservice.com, instruction.com, job4u.com, net-shopping.com, planetmail.com, planetmail.net, qualityservice.com, rescueteam.com, surgical.net, atheist.com, disciples.com, muslim.com, protestant.com, reborn.com, reincarnate.com, religious.com, saintly.com, brew-meister.com, cutey.com, dbzmail.com, doramail.com, galaxyhit.com, hilarious.com, humanoid.net, hot-shot.com, inorbit.com, iname.com, innocent.com, keromail.com, myself.com, rocketship.com, toothfairy.com, toke.com, tvstar.com, uymail.com, 2trom.com
-static P_MAIL_COM: Provider = Provider {
-    id: "mail.com",
-    status: Status::Preparation,
-    before_login_hint: "To log in with Delta Chat, you first need to activate POP3/IMAP in your mail.com settings. Note that this is a mail.com Premium feature only.",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/mail-com",
-    server: &[
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // mail.de.md: mail.de
 static P_MAIL_DE: Provider = Provider {
     id: "mail.de",
@@ -866,64 +875,6 @@ static P_MAILO_COM: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// mehl.cloud.md: mehl.cloud
-static P_MEHL_CLOUD: Provider = Provider {
-    id: "mehl.cloud",
-    status: Status::Ok,
-    before_login_hint: "",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/mehl-cloud",
-    server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "mehl.cloud",
-            port: 993,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "mehl.cloud",
-            port: 465,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Imap,
-            socket: Starttls,
-            hostname: "mehl.cloud",
-            port: 143,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Starttls,
-            hostname: "mehl.cloud",
-            port: 587,
-            username_pattern: Email,
-        },
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
-// mehl.store.md: mehl.store, ende.in.net, l2i.top, szh.homes, sls.post.in, ente.quest, ente.cfd, nein.jetzt
-static P_MEHL_STORE: Provider = Provider {
-    id: "mehl.store",
-    status: Status::Ok,
-    before_login_hint: "",
-    after_login_hint: "This account provides 3GB storage for eMails and the possibility to access a NEXTCLOUD-instance by using the email-credits!",
-    overview_page: "https://providers.delta.chat/mehl-store",
-    server: &[
-        Server { protocol: Imap, socket: Ssl, hostname: "mail.ende.in.net", port: 993, username_pattern: Email },
-        Server { protocol: Smtp, socket: Starttls, hostname: "mail.ende.in.net", port: 587, username_pattern: Email },
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // nauta.cu.md: nauta.cu
 static P_NAUTA_CU: Provider = Provider {
     id: "nauta.cu",
@@ -957,6 +908,10 @@ static P_NAUTA_CU: Provider = Provider {
             key: Config::DeleteServerAfter,
             value: "1",
         },
+        ConfigDefault {
+            key: Config::BccSelf,
+            value: "0",
+        },
         ConfigDefault {
             key: Config::SentboxWatch,
             value: "0",
@@ -969,6 +924,10 @@ static P_NAUTA_CU: Provider = Provider {
             key: Config::MediaQuality,
             value: "1",
         },
+        ConfigDefault {
+            key: Config::FetchExistingMsgs,
+            value: "0",
+        },
     ]),
     oauth2_authorizer: None,
 };
@@ -1023,20 +982,6 @@ static P_NINE_TESTRUN_ORG: Provider = Provider {
             port: 465,
             username_pattern: Email,
         },
-        Server {
-            protocol: Imap,
-            socket: Starttls,
-            hostname: "nine.testrun.org",
-            port: 143,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Starttls,
-            hostname: "nine.testrun.org",
-            port: 587,
-            username_pattern: Email,
-        },
     ],
     opt: ProviderOptions::new(),
     config_defaults: Some(&[ConfigDefault {
@@ -1186,34 +1131,6 @@ static P_PROTONMAIL: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// purelymail.com.md: purelymail.com, cheapermail.com, placeq.com, rethinkmail.com, worldofmail.com
-static P_PURELYMAIL_COM: Provider = Provider {
-    id: "purelymail.com",
-    status: Status::Ok,
-    before_login_hint: "",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/purelymail-com",
-    server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "imap.purelymail.com",
-            port: 993,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "smtp.purelymail.com",
-            port: 465,
-            username_pattern: Email,
-        },
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // qq.md: qq.com, foxmail.com
 static P_QQ: Provider = Provider {
     id: "qq",
@@ -1230,23 +1147,6 @@ static P_QQ: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// rambler.ru.md: rambler.ru, autorambler.ru, myrambler.ru, rambler.ua, lenta.ru, ro.ru, r0.ru
-static P_RAMBLER_RU: Provider = Provider {
-    id: "rambler.ru",
-    status: Status::Preparation,
-    before_login_hint: "Чтобы войти в Рамблер/почта через Delta Chat, необходимо предварительно включить доступ с помощью почтовых клиентов на сайте mail.rambler.ru",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/rambler-ru",
-    server: &[
-        Server { protocol: Imap, socket: Ssl, hostname: "imap.rambler.ru", port: 993, username_pattern: Email },
-        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.rambler.ru", port: 465, username_pattern: Email },
-        Server { protocol: Imap, socket: Starttls, hostname: "imap.rambler.ru", port: 143, username_pattern: Email },
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // riseup.net.md: riseup.net
 static P_RISEUP_NET: Provider = Provider {
     id: "riseup.net",
@@ -1260,14 +1160,14 @@ static P_RISEUP_NET: Provider = Provider {
             socket: Ssl,
             hostname: "mail.riseup.net",
             port: 993,
-            username_pattern: Emaillocalpart,
+            username_pattern: Email,
         },
         Server {
             protocol: Smtp,
             socket: Ssl,
             hostname: "mail.riseup.net",
             port: 465,
-            username_pattern: Emaillocalpart,
+            username_pattern: Email,
         },
     ],
     opt: ProviderOptions::new(),
@@ -1388,13 +1288,6 @@ static P_TESTRUN: Provider = Provider {
             port: 993,
             username_pattern: Email,
         },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "testrun.org",
-            port: 465,
-            username_pattern: Email,
-        },
         Server {
             protocol: Imap,
             socket: Starttls,
@@ -1552,20 +1445,6 @@ static P_VIVALDI: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// vk.com.md: vk.com
-static P_VK_COM: Provider = Provider {
-    id: "vk.com",
-    status: Status::Broken,
-    before_login_hint: "К сожалению, VK Почта не поддерживает работу с Delta Chat. См. https://help.vk.mail.ru/vkmail/questions/client",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/vk-com",
-    server: &[
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // vodafone.de.md: vodafone.de, vodafonemail.de
 static P_VODAFONE_DE: Provider = Provider {
     id: "vodafone.de",
@@ -1611,34 +1490,6 @@ static P_WEB_DE: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// wkpb.de.md: wkpb.de
-static P_WKPB_DE: Provider = Provider {
-    id: "wkpb.de",
-    status: Status::Preparation,
-    before_login_hint: "Dies sind die gleichen Anmeldedaten wie bei Moodle und Abitur-Online.",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/wkpb-de",
-    server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "pimap.schulon.org",
-            port: 993,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "psmtp.schulon.org",
-            port: 465,
-            username_pattern: Email,
-        },
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // yahoo.md: yahoo.com, yahoo.de, yahoo.it, yahoo.fr, yahoo.es, yahoo.se, yahoo.co.uk, yahoo.co.nz, yahoo.com.au, yahoo.com.ar, yahoo.com.br, yahoo.com.mx, ymail.com, rocketmail.com, yahoodns.net
 static P_YAHOO: Provider = Provider {
     id: "yahoo",
@@ -1757,10 +1608,9 @@ static P_ZOHO: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-pub(crate) static PROVIDER_DATA: [(&str, &Provider); 528] = [
+pub(crate) static PROVIDER_DATA: [(&str, &Provider); 318] = [
     ("163.com", &P_163),
     ("aktivix.org", &P_AKTIVIX_ORG),
-    ("aliyun.com", &P_ALIYUN),
     ("aol.com", &P_AOL),
     ("arcor.de", &P_ARCOR_DE),
     ("autistici.org", &P_AUTISTICI_ORG),
@@ -1768,10 +1618,12 @@ pub(crate) static PROVIDER_DATA: [(&str, &Provider); 528] = [
     ("delta.blindzeln.org", &P_BLINDZELN_ORG),
     ("bluewin.ch", &P_BLUEWIN_CH),
     ("buzon.uy", &P_BUZON_UY),
+    ("c1.testrun.org", &P_C1_TESTRUN_ORG),
+    ("c2.testrun.org", &P_C2_TESTRUN_ORG),
+    ("c3.testrun.org", &P_C3_TESTRUN_ORG),
     ("chello.at", &P_CHELLO_AT),
     ("xfinity.com", &P_COMCAST),
     ("comcast.net", &P_COMCAST),
-    ("daleth.cafe", &P_DALETH_CAFE),
     ("dismail.de", &P_DISMAIL_DE),
     ("disroot.org", &P_DISROOT),
     ("e.email", &P_E_EMAIL),
@@ -1923,194 +1775,6 @@ pub(crate) static PROVIDER_DATA: [(&str, &Provider); 528] = [
     ("ik.me", &P_INFOMANIAK_COM),
     ("kolst.com", &P_KOLST_COM),
     ("kontent.com", &P_KONTENT_COM),
-    ("email.com", &P_MAIL_COM),
-    ("groupmail.com", &P_MAIL_COM),
-    ("post.com", &P_MAIL_COM),
-    ("homemail.com", &P_MAIL_COM),
-    ("housemail.com", &P_MAIL_COM),
-    ("writeme.com", &P_MAIL_COM),
-    ("mail.com", &P_MAIL_COM),
-    ("mail-me.com", &P_MAIL_COM),
-    ("workmail.com", &P_MAIL_COM),
-    ("accountant.com", &P_MAIL_COM),
-    ("activist.com", &P_MAIL_COM),
-    ("adexec.com", &P_MAIL_COM),
-    ("allergist.com", &P_MAIL_COM),
-    ("alumni.com", &P_MAIL_COM),
-    ("alumnidirector.com", &P_MAIL_COM),
-    ("archaeologist.com", &P_MAIL_COM),
-    ("auctioneer.net", &P_MAIL_COM),
-    ("bartender.net", &P_MAIL_COM),
-    ("brew-master.com", &P_MAIL_COM),
-    ("chef.net", &P_MAIL_COM),
-    ("chemist.com", &P_MAIL_COM),
-    ("collector.org", &P_MAIL_COM),
-    ("columnist.com", &P_MAIL_COM),
-    ("comic.com", &P_MAIL_COM),
-    ("consultant.com", &P_MAIL_COM),
-    ("contractor.net", &P_MAIL_COM),
-    ("counsellor.com", &P_MAIL_COM),
-    ("deliveryman.com", &P_MAIL_COM),
-    ("diplomats.com", &P_MAIL_COM),
-    ("dr.com", &P_MAIL_COM),
-    ("engineer.com", &P_MAIL_COM),
-    ("financier.com", &P_MAIL_COM),
-    ("fireman.net", &P_MAIL_COM),
-    ("gardener.com", &P_MAIL_COM),
-    ("geologist.com", &P_MAIL_COM),
-    ("graphic-designer.com", &P_MAIL_COM),
-    ("graduate.org", &P_MAIL_COM),
-    ("hairdresser.net", &P_MAIL_COM),
-    ("instructor.net", &P_MAIL_COM),
-    ("insurer.com", &P_MAIL_COM),
-    ("journalist.com", &P_MAIL_COM),
-    ("legislator.com", &P_MAIL_COM),
-    ("lobbyist.com", &P_MAIL_COM),
-    ("minister.com", &P_MAIL_COM),
-    ("musician.org", &P_MAIL_COM),
-    ("optician.com", &P_MAIL_COM),
-    ("orthodontist.net", &P_MAIL_COM),
-    ("pediatrician.com", &P_MAIL_COM),
-    ("photographer.net", &P_MAIL_COM),
-    ("physicist.net", &P_MAIL_COM),
-    ("politician.com", &P_MAIL_COM),
-    ("presidency.com", &P_MAIL_COM),
-    ("priest.com", &P_MAIL_COM),
-    ("programmer.net", &P_MAIL_COM),
-    ("publicist.com", &P_MAIL_COM),
-    ("radiologist.net", &P_MAIL_COM),
-    ("realtyagent.com", &P_MAIL_COM),
-    ("registerednurses.com", &P_MAIL_COM),
-    ("repairman.com", &P_MAIL_COM),
-    ("representative.com", &P_MAIL_COM),
-    ("salesperson.net", &P_MAIL_COM),
-    ("secretary.net", &P_MAIL_COM),
-    ("socialworker.net", &P_MAIL_COM),
-    ("sociologist.com", &P_MAIL_COM),
-    ("songwriter.net", &P_MAIL_COM),
-    ("teachers.org", &P_MAIL_COM),
-    ("techie.com", &P_MAIL_COM),
-    ("technologist.com", &P_MAIL_COM),
-    ("therapist.net", &P_MAIL_COM),
-    ("umpire.com", &P_MAIL_COM),
-    ("worker.com", &P_MAIL_COM),
-    ("artlover.com", &P_MAIL_COM),
-    ("bikerider.com", &P_MAIL_COM),
-    ("birdlover.com", &P_MAIL_COM),
-    ("blader.com", &P_MAIL_COM),
-    ("kittymail.com", &P_MAIL_COM),
-    ("lovecat.com", &P_MAIL_COM),
-    ("marchmail.com", &P_MAIL_COM),
-    ("boardermail.com", &P_MAIL_COM),
-    ("catlover.com", &P_MAIL_COM),
-    ("clubmember.org", &P_MAIL_COM),
-    ("nonpartisan.com", &P_MAIL_COM),
-    ("petlover.com", &P_MAIL_COM),
-    ("doglover.com", &P_MAIL_COM),
-    ("greenmail.net", &P_MAIL_COM),
-    ("hackermail.com", &P_MAIL_COM),
-    ("theplate.com", &P_MAIL_COM),
-    ("bsdmail.com", &P_MAIL_COM),
-    ("computer4u.com", &P_MAIL_COM),
-    ("coolsite.net", &P_MAIL_COM),
-    ("cyberdude.com", &P_MAIL_COM),
-    ("cybergal.com", &P_MAIL_COM),
-    ("cyberservices.com", &P_MAIL_COM),
-    ("cyber-wizard.com", &P_MAIL_COM),
-    ("linuxmail.org", &P_MAIL_COM),
-    ("null.net", &P_MAIL_COM),
-    ("solution4u.com", &P_MAIL_COM),
-    ("tech-center.com", &P_MAIL_COM),
-    ("webname.com", &P_MAIL_COM),
-    ("acdcfan.com", &P_MAIL_COM),
-    ("angelic.com", &P_MAIL_COM),
-    ("discofan.com", &P_MAIL_COM),
-    ("elvisfan.com", &P_MAIL_COM),
-    ("hiphopfan.com", &P_MAIL_COM),
-    ("kissfans.com", &P_MAIL_COM),
-    ("madonnafan.com", &P_MAIL_COM),
-    ("metalfan.com", &P_MAIL_COM),
-    ("ninfan.com", &P_MAIL_COM),
-    ("ravemail.com", &P_MAIL_COM),
-    ("reggaefan.com", &P_MAIL_COM),
-    ("snakebite.com", &P_MAIL_COM),
-    ("bellair.net", &P_MAIL_COM),
-    ("californiamail.com", &P_MAIL_COM),
-    ("dallasmail.com", &P_MAIL_COM),
-    ("nycmail.com", &P_MAIL_COM),
-    ("pacific-ocean.com", &P_MAIL_COM),
-    ("pacificwest.com", &P_MAIL_COM),
-    ("sanfranmail.com", &P_MAIL_COM),
-    ("usa.com", &P_MAIL_COM),
-    ("africamail.com", &P_MAIL_COM),
-    ("asia-mail.com", &P_MAIL_COM),
-    ("australiamail.com", &P_MAIL_COM),
-    ("berlin.com", &P_MAIL_COM),
-    ("brazilmail.com", &P_MAIL_COM),
-    ("chinamail.com", &P_MAIL_COM),
-    ("dublin.com", &P_MAIL_COM),
-    ("dutchmail.com", &P_MAIL_COM),
-    ("englandmail.com", &P_MAIL_COM),
-    ("europe.com", &P_MAIL_COM),
-    ("arcticmail.com", &P_MAIL_COM),
-    ("europemail.com", &P_MAIL_COM),
-    ("germanymail.com", &P_MAIL_COM),
-    ("irelandmail.com", &P_MAIL_COM),
-    ("israelmail.com", &P_MAIL_COM),
-    ("italymail.com", &P_MAIL_COM),
-    ("koreamail.com", &P_MAIL_COM),
-    ("mexicomail.com", &P_MAIL_COM),
-    ("moscowmail.com", &P_MAIL_COM),
-    ("munich.com", &P_MAIL_COM),
-    ("asia.com", &P_MAIL_COM),
-    ("polandmail.com", &P_MAIL_COM),
-    ("safrica.com", &P_MAIL_COM),
-    ("samerica.com", &P_MAIL_COM),
-    ("scotlandmail.com", &P_MAIL_COM),
-    ("spainmail.com", &P_MAIL_COM),
-    ("swedenmail.com", &P_MAIL_COM),
-    ("swissmail.com", &P_MAIL_COM),
-    ("torontomail.com", &P_MAIL_COM),
-    ("aircraftmail.com", &P_MAIL_COM),
-    ("cash4u.com", &P_MAIL_COM),
-    ("disposable.com", &P_MAIL_COM),
-    ("execs.com", &P_MAIL_COM),
-    ("fastservice.com", &P_MAIL_COM),
-    ("instruction.com", &P_MAIL_COM),
-    ("job4u.com", &P_MAIL_COM),
-    ("net-shopping.com", &P_MAIL_COM),
-    ("planetmail.com", &P_MAIL_COM),
-    ("planetmail.net", &P_MAIL_COM),
-    ("qualityservice.com", &P_MAIL_COM),
-    ("rescueteam.com", &P_MAIL_COM),
-    ("surgical.net", &P_MAIL_COM),
-    ("atheist.com", &P_MAIL_COM),
-    ("disciples.com", &P_MAIL_COM),
-    ("muslim.com", &P_MAIL_COM),
-    ("protestant.com", &P_MAIL_COM),
-    ("reborn.com", &P_MAIL_COM),
-    ("reincarnate.com", &P_MAIL_COM),
-    ("religious.com", &P_MAIL_COM),
-    ("saintly.com", &P_MAIL_COM),
-    ("brew-meister.com", &P_MAIL_COM),
-    ("cutey.com", &P_MAIL_COM),
-    ("dbzmail.com", &P_MAIL_COM),
-    ("doramail.com", &P_MAIL_COM),
-    ("galaxyhit.com", &P_MAIL_COM),
-    ("hilarious.com", &P_MAIL_COM),
-    ("humanoid.net", &P_MAIL_COM),
-    ("hot-shot.com", &P_MAIL_COM),
-    ("inorbit.com", &P_MAIL_COM),
-    ("iname.com", &P_MAIL_COM),
-    ("innocent.com", &P_MAIL_COM),
-    ("keromail.com", &P_MAIL_COM),
-    ("myself.com", &P_MAIL_COM),
-    ("rocketship.com", &P_MAIL_COM),
-    ("toothfairy.com", &P_MAIL_COM),
-    ("toke.com", &P_MAIL_COM),
-    ("tvstar.com", &P_MAIL_COM),
-    ("uymail.com", &P_MAIL_COM),
-    ("2trom.com", &P_MAIL_COM),
     ("mail.de", &P_MAIL_DE),
     ("mail.ru", &P_MAIL_RU),
     ("inbox.ru", &P_MAIL_RU),
@@ -2121,15 +1785,6 @@ pub(crate) static PROVIDER_DATA: [(&str, &Provider); 528] = [
     ("mailbox.org", &P_MAILBOX_ORG),
     ("secure.mailbox.org", &P_MAILBOX_ORG),
     ("mailo.com", &P_MAILO_COM),
-    ("mehl.cloud", &P_MEHL_CLOUD),
-    ("mehl.store", &P_MEHL_STORE),
-    ("ende.in.net", &P_MEHL_STORE),
-    ("l2i.top", &P_MEHL_STORE),
-    ("szh.homes", &P_MEHL_STORE),
-    ("sls.post.in", &P_MEHL_STORE),
-    ("ente.quest", &P_MEHL_STORE),
-    ("ente.cfd", &P_MEHL_STORE),
-    ("nein.jetzt", &P_MEHL_STORE),
     ("nauta.cu", &P_NAUTA_CU),
     ("naver.com", &P_NAVER),
     ("nine.testrun.org", &P_NINE_TESTRUN_ORG),
@@ -2195,20 +1850,8 @@ pub(crate) static PROVIDER_DATA: [(&str, &Provider); 528] = [
     ("protonmail.com", &P_PROTONMAIL),
     ("protonmail.ch", &P_PROTONMAIL),
     ("pm.me", &P_PROTONMAIL),
-    ("purelymail.com", &P_PURELYMAIL_COM),
-    ("cheapermail.com", &P_PURELYMAIL_COM),
-    ("placeq.com", &P_PURELYMAIL_COM),
-    ("rethinkmail.com", &P_PURELYMAIL_COM),
-    ("worldofmail.com", &P_PURELYMAIL_COM),
     ("qq.com", &P_QQ),
     ("foxmail.com", &P_QQ),
-    ("rambler.ru", &P_RAMBLER_RU),
-    ("autorambler.ru", &P_RAMBLER_RU),
-    ("myrambler.ru", &P_RAMBLER_RU),
-    ("rambler.ua", &P_RAMBLER_RU),
-    ("lenta.ru", &P_RAMBLER_RU),
-    ("ro.ru", &P_RAMBLER_RU),
-    ("r0.ru", &P_RAMBLER_RU),
     ("riseup.net", &P_RISEUP_NET),
     ("rogers.com", &P_ROGERS_COM),
     ("sonic.net", &P_SONIC),
@@ -2228,7 +1871,6 @@ pub(crate) static PROVIDER_DATA: [(&str, &Provider); 528] = [
     ("undernet.uy", &P_UNDERNET_UY),
     ("vfemail.net", &P_VFEMAIL),
     ("vivaldi.net", &P_VIVALDI),
-    ("vk.com", &P_VK_COM),
     ("vodafone.de", &P_VODAFONE_DE),
     ("vodafonemail.de", &P_VODAFONE_DE),
     ("web.de", &P_WEB_DE),
@@ -2258,7 +1900,6 @@ pub(crate) static PROVIDER_DATA: [(&str, &Provider); 528] = [
     ("joker.ms", &P_WEB_DE),
     ("planet.ms", &P_WEB_DE),
     ("power.ms", &P_WEB_DE),
-    ("wkpb.de", &P_WKPB_DE),
     ("yahoo.com", &P_YAHOO),
     ("yahoo.de", &P_YAHOO),
     ("yahoo.it", &P_YAHOO),
@@ -2292,16 +1933,17 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
     HashMap::from([
         ("163", &P_163),
         ("aktivix.org", &P_AKTIVIX_ORG),
-        ("aliyun", &P_ALIYUN),
         ("aol", &P_AOL),
         ("arcor.de", &P_ARCOR_DE),
         ("autistici.org", &P_AUTISTICI_ORG),
         ("blindzeln.org", &P_BLINDZELN_ORG),
         ("bluewin.ch", &P_BLUEWIN_CH),
         ("buzon.uy", &P_BUZON_UY),
+        ("c1.testrun.org", &P_C1_TESTRUN_ORG),
+        ("c2.testrun.org", &P_C2_TESTRUN_ORG),
+        ("c3.testrun.org", &P_C3_TESTRUN_ORG),
         ("chello.at", &P_CHELLO_AT),
         ("comcast", &P_COMCAST),
-        ("daleth.cafe", &P_DALETH_CAFE),
         ("dismail.de", &P_DISMAIL_DE),
         ("disroot", &P_DISROOT),
         ("e.email", &P_E_EMAIL),
@@ -2321,14 +1963,11 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
         ("infomaniak.com", &P_INFOMANIAK_COM),
         ("kolst.com", &P_KOLST_COM),
         ("kontent.com", &P_KONTENT_COM),
-        ("mail.com", &P_MAIL_COM),
         ("mail.de", &P_MAIL_DE),
         ("mail.ru", &P_MAIL_RU),
         ("mail2tor", &P_MAIL2TOR),
         ("mailbox.org", &P_MAILBOX_ORG),
         ("mailo.com", &P_MAILO_COM),
-        ("mehl.cloud", &P_MEHL_CLOUD),
-        ("mehl.store", &P_MEHL_STORE),
         ("nauta.cu", &P_NAUTA_CU),
         ("naver", &P_NAVER),
         ("nine.testrun.org", &P_NINE_TESTRUN_ORG),
@@ -2337,9 +1976,7 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
         ("ouvaton.coop", &P_OUVATON_COOP),
         ("posteo", &P_POSTEO),
         ("protonmail", &P_PROTONMAIL),
-        ("purelymail.com", &P_PURELYMAIL_COM),
         ("qq", &P_QQ),
-        ("rambler.ru", &P_RAMBLER_RU),
         ("riseup.net", &P_RISEUP_NET),
         ("rogers.com", &P_ROGERS_COM),
         ("sonic", &P_SONIC),
@@ -2353,10 +1990,8 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
         ("undernet.uy", &P_UNDERNET_UY),
         ("vfemail", &P_VFEMAIL),
         ("vivaldi", &P_VIVALDI),
-        ("vk.com", &P_VK_COM),
         ("vodafone.de", &P_VODAFONE_DE),
         ("web.de", &P_WEB_DE),
-        ("wkpb.de", &P_WKPB_DE),
         ("yahoo", &P_YAHOO),
         ("yandex.ru", &P_YANDEX_RU),
         ("yggmail", &P_YGGMAIL),
@@ -2366,4 +2001,4 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
 });
 
 pub static _PROVIDER_UPDATED: Lazy<chrono::NaiveDate> =
-    Lazy::new(|| chrono::NaiveDate::from_ymd_opt(2024, 6, 24).unwrap());
+    Lazy::new(|| chrono::NaiveDate::from_ymd_opt(2024, 2, 5).unwrap());

src/push.rs

@@ -5,6 +5,7 @@ use anyhow::Result;
 use tokio::sync::RwLock;
 
 use crate::context::Context;
+use crate::net::http;
 
 /// Manages subscription to Apple Push Notification services.
 ///
@@ -47,10 +48,7 @@ impl PushSubscriber {
     }
 
     /// Subscribes for heartbeat notifications with previously set device token.
-    #[cfg(target_os = "ios")]
     pub(crate) async fn subscribe(&self) -> Result<()> {
-        use crate::net::http;
-
         let mut state = self.inner.write().await;
 
         if state.heartbeat_subscribed {
@@ -75,14 +73,6 @@ impl PushSubscriber {
         Ok(())
     }
 
-    /// Placeholder to skip subscribing to heartbeat notifications outside iOS.
-    #[cfg(not(target_os = "ios"))]
-    pub(crate) async fn subscribe(&self) -> Result<()> {
-        let mut state = self.inner.write().await;
-        state.heartbeat_subscribed = true;
-        Ok(())
-    }
-
     pub(crate) async fn heartbeat_subscribed(&self) -> bool {
         self.inner.read().await.heartbeat_subscribed
     }

src/qr.rs

@@ -20,6 +20,7 @@ use crate::events::EventType;
 use crate::key::Fingerprint;
 use crate::message::Message;
 use crate::peerstate::Peerstate;
+use crate::socks::Socks5Config;
 use crate::token;
 use crate::tools::validate_id;
 use iroh_old as iroh;
@@ -36,13 +37,8 @@ const VCARD_SCHEME: &str = "BEGIN:VCARD";
 const SMTP_SCHEME: &str = "SMTP:";
 const HTTP_SCHEME: &str = "http://";
 const HTTPS_SCHEME: &str = "https://";
-
-/// Legacy backup transfer based on iroh 0.4.
 pub(crate) const DCBACKUP_SCHEME: &str = "DCBACKUP:";
 
-/// Backup transfer based on iroh-net.
-pub(crate) const DCBACKUP2_SCHEME: &str = "DCBACKUP2:";
-
 /// Scanned QR code.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Qr {
@@ -110,7 +106,7 @@ pub enum Qr {
         domain: String,
     },
 
-    /// Provides a backup that can be retrieved using legacy iroh 0.4.
+    /// Provides a backup that can be retrieve.
     ///
     /// This contains all the data needed to connect to a device and download a backup from
     /// it to configure the receiving device with the same account.
@@ -124,15 +120,6 @@ pub enum Qr {
         ticket: iroh::provider::Ticket,
     },
 
-    /// Provides a backup that can be retrieved using iroh-net based backup transfer protocol.
-    Backup2 {
-        /// Iroh node address.
-        node_addr: iroh_net::NodeAddr,
-
-        /// Authentication token.
-        auth_token: String,
-    },
-
     /// Ask the user if they want to use the given service for video chats.
     WebrtcInstance {
         /// Server domain name.
@@ -279,8 +266,6 @@ pub async fn check_qr(context: &Context, qr: &str) -> Result<Qr> {
         decode_webrtc_instance(context, qr)?
     } else if starts_with_ignore_case(qr, DCBACKUP_SCHEME) {
         decode_backup(qr)?
-    } else if starts_with_ignore_case(qr, DCBACKUP2_SCHEME) {
-        decode_backup2(qr)?
     } else if qr.starts_with(MAILTO_SCHEME) {
         decode_mailto(context, qr).await?
     } else if qr.starts_with(SMTP_SCHEME) {
@@ -310,13 +295,6 @@ pub async fn check_qr(context: &Context, qr: &str) -> Result<Qr> {
 pub fn format_backup(qr: &Qr) -> Result<String> {
     match qr {
         Qr::Backup { ref ticket } => Ok(format!("{DCBACKUP_SCHEME}{ticket}")),
-        Qr::Backup2 {
-            ref node_addr,
-            ref auth_token,
-        } => {
-            let node_addr = serde_json::to_string(node_addr)?;
-            Ok(format!("{DCBACKUP2_SCHEME}{auth_token}&{node_addr}"))
-        }
         _ => Err(anyhow!("Not a backup QR code")),
     }
 }
@@ -509,7 +487,7 @@ fn decode_account(qr: &str) -> Result<Qr> {
         Ok(Qr::Account {
             domain: url
                 .host_str()
-                .context("can't extract account setup domain")?
+                .context("can't extract WebRTC instance domain")?
                 .to_string(),
         })
     } else {
@@ -551,24 +529,6 @@ fn decode_backup(qr: &str) -> Result<Qr> {
     Ok(Qr::Backup { ticket })
 }
 
-/// Decodes a [`DCBACKUP2_SCHEME`] QR code.
-fn decode_backup2(qr: &str) -> Result<Qr> {
-    let payload = qr
-        .strip_prefix(DCBACKUP2_SCHEME)
-        .ok_or_else(|| anyhow!("invalid DCBACKUP scheme"))?;
-    let (auth_token, node_addr) = payload
-        .split_once('&')
-        .context("Backup QR code has no separator")?;
-    let auth_token = auth_token.to_string();
-    let node_addr = serde_json::from_str::<iroh_net::NodeAddr>(node_addr)
-        .context("Invalid node addr in backup QR code")?;
-
-    Ok(Qr::Backup2 {
-        node_addr,
-        auth_token,
-    })
-}
-
 #[derive(Debug, Deserialize)]
 struct CreateAccountSuccessResponse {
     /// Email address.
@@ -589,16 +549,8 @@ struct CreateAccountErrorResponse {
 #[allow(clippy::indexing_slicing)]
 async fn set_account_from_qr(context: &Context, qr: &str) -> Result<()> {
     let url_str = &qr[DCACCOUNT_SCHEME.len()..];
-
-    if !url_str.starts_with(HTTPS_SCHEME) {
-        bail!("DCACCOUNT QR codes must use HTTPS scheme");
-    }
-
-    // As only HTTPS is used, it is safe to load DNS cache.
-    let load_cache = true;
-
-    let response = crate::net::http::get_client(context, load_cache)
-        .await?
+    let socks5_config = Socks5Config::from_database(&context.sql).await?;
+    let response = crate::net::http::get_client(socks5_config)?
         .post(url_str)
         .send()
         .await?;
@@ -659,6 +611,7 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             context
                 .sync_qr_code_token_deletion(invitenumber, authcode)
                 .await?;
+            context.send_sync_msg().await?;
         }
         Qr::WithdrawVerifyGroup {
             invitenumber,
@@ -670,6 +623,7 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             context
                 .sync_qr_code_token_deletion(invitenumber, authcode)
                 .await?;
+            context.send_sync_msg().await?;
         }
         Qr::ReviveVerifyContact {
             invitenumber,
@@ -679,7 +633,7 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             token::save(context, token::Namespace::InviteNumber, None, &invitenumber).await?;
             token::save(context, token::Namespace::Auth, None, &authcode).await?;
             context.sync_qr_code_tokens(None).await?;
-            context.scheduler.interrupt_smtp().await;
+            context.send_sync_msg().await?;
         }
         Qr::ReviveVerifyGroup {
             invitenumber,
@@ -699,7 +653,7 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             .await?;
             token::save(context, token::Namespace::Auth, chat_id, &authcode).await?;
             context.sync_qr_code_tokens(chat_id).await?;
-            context.scheduler.interrupt_smtp().await;
+            context.send_sync_msg().await?;
         }
         Qr::Login { address, options } => {
             configure_from_login_qr(context, &address, options).await?

src/qr_code_generator.rs

@@ -58,7 +58,7 @@ async fn generate_verification_qr(context: &Context) -> Result<String> {
     )
 }
 
-/// Renders a [`Qr::Backup2`] QR code as an SVG image.
+/// Renders a [`Qr::Backup`] QR code as an SVG image.
 pub async fn generate_backup_qr(context: &Context, qr: &Qr) -> Result<String> {
     let content = qr::format_backup(qr)?;
     let (avatar, displayname, _addr, color) = self_info(context).await?;

src/quota.rs

@@ -1,7 +1,6 @@
 //! # Support for IMAP QUOTA extension.
 
 use std::collections::BTreeMap;
-use std::time::Duration;
 
 use anyhow::{anyhow, Context as _, Result};
 use async_imap::types::{Quota, QuotaResource};
@@ -12,7 +11,7 @@ use crate::context::Context;
 use crate::imap::scan_folders::get_watched_folders;
 use crate::imap::session::Session as ImapSession;
 use crate::message::{Message, Viewtype};
-use crate::tools::{self, time_elapsed};
+use crate::tools;
 use crate::{stock_str, EventType};
 
 /// warn about a nearly full mailbox after this usage percentage is reached.
@@ -103,16 +102,6 @@ pub fn needs_quota_warning(curr_percentage: u64, warned_at_percentage: u64) -> b
 }
 
 impl Context {
-    /// Returns whether the quota value needs an update. If so, `update_recent_quota()` should be
-    /// called.
-    pub(crate) async fn quota_needs_update(&self, ratelimit_secs: u64) -> bool {
-        let quota = self.quota.read().await;
-        quota
-            .as_ref()
-            .filter(|quota| time_elapsed(&quota.modified) < Duration::from_secs(ratelimit_secs))
-            .is_none()
-    }
-
     /// Updates `quota.recent`, sets `quota.modified` to the current time
     /// and emits an event to let the UIs update connectivity view.
     ///
@@ -166,7 +155,6 @@ impl Context {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::TestContextManager;
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_needs_quota_warning() -> Result<()> {
@@ -195,24 +183,4 @@ mod tests {
         assert!(QUOTA_ERROR_THRESHOLD_PERCENTAGE < 100);
         Ok(())
     }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_quota_needs_update() {
-        let mut tcm = TestContextManager::new();
-        let t = &tcm.unconfigured().await;
-        const TIMEOUT: u64 = 60;
-        assert!(t.quota_needs_update(TIMEOUT).await);
-
-        *t.quota.write().await = Some(QuotaInfo {
-            recent: Ok(Default::default()),
-            modified: tools::Time::now() - Duration::from_secs(TIMEOUT + 1),
-        });
-        assert!(t.quota_needs_update(TIMEOUT).await);
-
-        *t.quota.write().await = Some(QuotaInfo {
-            recent: Ok(Default::default()),
-            modified: tools::Time::now(),
-        });
-        assert!(!t.quota_needs_update(TIMEOUT).await);
-    }
 }

src/receive_imf.rs

@@ -4,7 +4,9 @@ use std::collections::HashSet;
 use std::str::FromStr;
 
 use anyhow::{Context as _, Result};
-use deltachat_contact_tools::{addr_cmp, may_be_valid_addr, sanitize_single_line, ContactAddress};
+use deltachat_contact_tools::{
+    addr_cmp, may_be_valid_addr, normalize_name, strip_rtlo_characters, ContactAddress,
+};
 use iroh_gossip::proto::TopicId;
 use mailparse::{parse_mail, SingleInfo};
 use num_traits::FromPrimitive;
@@ -25,7 +27,7 @@ use crate::headerdef::{HeaderDef, HeaderDefMap};
 use crate::imap::{markseen_on_imap_table, GENERATED_PREFIX};
 use crate::log::LogExt;
 use crate::message::{
-    self, rfc724_mid_exists, rfc724_mid_exists_ex, Message, MessageState, MessengerMessage, MsgId,
+    self, rfc724_mid_exists, rfc724_mid_exists_and, Message, MessageState, MessengerMessage, MsgId,
     Viewtype,
 };
 use crate::mimeparser::{parse_message_ids, AvatarAction, MimeMessage, SystemMessage};
@@ -38,7 +40,7 @@ use crate::simplify;
 use crate::sql;
 use crate::stock_str;
 use crate::sync::Sync::*;
-use crate::tools::{self, buf_compress, remove_subject_prefix};
+use crate::tools::{self, buf_compress};
 use crate::{chatlist_events, location};
 use crate::{contact, imap};
 use iroh_net::NodeAddr;
@@ -487,9 +489,7 @@ pub(crate) async fn receive_imf_inner(
             can_info_msg = false;
             Some(Message::load_from_db(context, insert_msg_id).await?)
         } else if let Some(field) = mime_parser.get_header(HeaderDef::InReplyTo) {
-            if let Some(instance) =
-                message::get_by_rfc724_mids(context, &parse_message_ids(field)).await?
-            {
+            if let Some(instance) = get_rfc724_mid_in_list(context, field).await? {
                 can_info_msg = instance.download_state() == DownloadState::Done;
                 Some(instance)
             } else {
@@ -632,9 +632,9 @@ pub(crate) async fn receive_imf_inner(
 /// Also returns whether it is blocked or not and its origin.
 ///
 /// * `prevent_rename`: if true, the display_name of this contact will not be changed. Useful for
-///   mailing lists: In some mailing lists, many users write from the same address but with different
-///   display names. We don't want the display name to change every time the user gets a new email from
-///   a mailing list.
+/// mailing lists: In some mailing lists, many users write from the same address but with different
+/// display names. We don't want the display name to change every time the user gets a new email from
+/// a mailing list.
 ///
 /// Returns `None` if From field does not contain a valid contact address.
 pub async fn from_field_to_contact_id(
@@ -658,10 +658,10 @@ pub async fn from_field_to_contact_id(
         }
     };
 
-    let (from_id, _) = Contact::add_or_lookup(
+    let from_id = add_or_lookup_contact_by_addr(
         context,
-        display_name.unwrap_or_default(),
-        &from_addr,
+        display_name,
+        from_addr,
         Origin::IncomingUnknownFrom,
     )
     .await?;
@@ -694,9 +694,6 @@ async fn add_parts(
     prevent_rename: bool,
     verified_encryption: VerifiedEncryption,
 ) -> Result<ReceivedMsg> {
-    let is_bot = context.get_config_bool(Config::Bot).await?;
-    // Bots handle existing messages the same way as new ones.
-    let fetching_existing_messages = fetching_existing_messages && !is_bot;
     let rfc724_mid_orig = &mime_parser
         .get_rfc724_mid()
         .unwrap_or(rfc724_mid.to_string());
@@ -710,13 +707,9 @@ async fn add_parts(
         better_msg = Some(stock_str::msg_location_enabled_by(context, from_id).await);
     }
 
-    let parent = get_parent_message(
-        context,
-        mime_parser.get_header(HeaderDef::References),
-        mime_parser.get_header(HeaderDef::InReplyTo),
-    )
-    .await?
-    .filter(|p| Some(p.id) != replace_msg_id);
+    let parent = get_parent_message(context, mime_parser)
+        .await?
+        .filter(|p| Some(p.id) != replace_msg_id);
 
     let is_dc_message = if mime_parser.has_chat_version() {
         MessengerMessage::Yes
@@ -789,6 +782,9 @@ async fn add_parts(
             info!(context, "Message is an MDN (TRASH).",);
         }
 
+        // signals whether the current user is a bot
+        let is_bot = context.get_config_bool(Config::Bot).await?;
+
         let create_blocked_default = if is_bot {
             Blocked::Not
         } else {
@@ -1444,19 +1440,12 @@ async fn add_parts(
             Ok(node_addr) => {
                 info!(context, "Adding iroh peer with address {node_addr:?}.");
                 let instance_id = parent.context("Failed to get parent message")?.id;
-                if let Some(topic) = get_iroh_topic_for_msg(context, instance_id).await? {
-                    let node_id = node_addr.node_id;
-                    let relay_server = node_addr.relay_url().map(|relay| relay.as_str());
-                    iroh_add_peer_for_topic(context, instance_id, topic, node_id, relay_server)
-                        .await?;
-                    let iroh = context.get_or_try_init_peer_channel().await?;
-                    iroh.maybe_add_gossip_peers(topic, vec![node_addr]).await?;
-                } else {
-                    warn!(
-                        context,
-                        "Could not add iroh peer because {instance_id} has no topic"
-                    );
-                }
+                let node_id = node_addr.node_id;
+                let relay_server = node_addr.relay_url().map(|relay| relay.as_str());
+                let topic = get_iroh_topic_for_msg(context, instance_id).await?;
+                iroh_add_peer_for_topic(context, instance_id, topic, node_id, relay_server).await?;
+                let iroh = context.get_or_try_init_peer_channel().await?;
+                iroh.maybe_add_gossip_peers(topic, vec![node_addr]).await?;
                 chat_id = DC_CHAT_ID_TRASH;
             }
             Err(err) => {
@@ -1545,7 +1534,7 @@ INSERT INTO msgs
     rfc724_mid, chat_id,
     from_id, to_id, timestamp, timestamp_sent, 
     timestamp_rcvd, type, state, msgrmsg, 
-    txt, txt_normalized, subject, txt_raw, param, hidden,
+    txt, subject, txt_raw, param, hidden,
     bytes, mime_headers, mime_compressed, mime_in_reply_to,
     mime_references, mime_modified, error, ephemeral_timer,
     ephemeral_timestamp, download_state, hop_info
@@ -1555,7 +1544,7 @@ INSERT INTO msgs
     ?, ?, ?, ?,
     ?, ?, ?, ?,
     ?, ?, ?, ?, ?,
-    ?, ?, ?, ?, ?, 1,
+    ?, ?, ?, ?, 1,
     ?, ?, ?, ?,
     ?, ?, ?, ?
   )
@@ -1563,8 +1552,7 @@ ON CONFLICT (id) DO UPDATE
 SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
     from_id=excluded.from_id, to_id=excluded.to_id, timestamp_sent=excluded.timestamp_sent,
     type=excluded.type, msgrmsg=excluded.msgrmsg,
-    txt=excluded.txt, txt_normalized=excluded.txt_normalized, subject=excluded.subject,
-    txt_raw=excluded.txt_raw, param=excluded.param,
+    txt=excluded.txt, subject=excluded.subject, txt_raw=excluded.txt_raw, param=excluded.param,
     hidden=excluded.hidden,bytes=excluded.bytes, mime_headers=excluded.mime_headers,
     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,
@@ -1584,7 +1572,6 @@ RETURNING id
                     state,
                     is_dc_message,
                     if trash { "" } else { msg },
-                    if trash { None } else { message::normalize_text(msg) },
                     if trash { "" } else { &subject },
                     // txt_raw might contain invalid utf8
                     if trash { "" } else { &txt_raw },
@@ -1657,20 +1644,11 @@ RETURNING id
     }
 
     if let Some(replace_msg_id) = replace_msg_id {
-        // Trash the "replace" placeholder with a message that has no parts. If it has the original
-        // "Message-ID", mark the placeholder for server-side deletion so as if the user deletes the
-        // fully downloaded message later, the server-side deletion is issued.
-        let on_server = rfc724_mid == rfc724_mid_orig;
-        replace_msg_id.trash(context, on_server).await?;
+        // "Replace" placeholder with a message that has no parts.
+        replace_msg_id.trash(context).await?;
     }
 
-    let unarchive = match mime_parser.get_header(HeaderDef::ChatGroupMemberRemoved) {
-        Some(addr) => context.is_self_addr(addr).await?,
-        None => true,
-    };
-    if unarchive {
-        chat_id.unarchive_if_not_muted(context, state).await?;
-    }
+    chat_id.unarchive_if_not_muted(context, state).await?;
 
     info!(
         context,
@@ -1830,7 +1808,7 @@ async fn lookup_chat_or_create_adhoc_group(
         Ok(Some((new_chat_id, new_chat_id_blocked)))
     } else if allow_creation {
         // Try to create an ad hoc group.
-        create_adhoc_group(
+        if let Some(new_chat_id) = create_adhoc_group(
             context,
             mime_parser,
             create_blocked,
@@ -1839,7 +1817,12 @@ async fn lookup_chat_or_create_adhoc_group(
             is_partial_download,
         )
         .await
-        .context("Could not create ad hoc group")
+        .context("Could not create ad hoc group")?
+        {
+            Ok(Some((new_chat_id, create_blocked)))
+        } else {
+            Ok(None)
+        }
     } else {
         Ok(None)
     }
@@ -1947,9 +1930,8 @@ async fn create_group(
         let grpname = mime_parser
             .get_header(HeaderDef::ChatGroupName)
             .context("Chat-Group-Name vanished")?
-            // Workaround for the "Space added before long group names after MIME
-            // serialization/deserialization #3650" issue. DC itself never creates group names with
-            // leading/trailing whitespace.
+            // W/a for "Space added before long group names after MIME serialization/deserialization
+            // #3650" issue. DC itself never creates group names with leading/trailing whitespace.
             .trim();
         let new_chat_id = ChatId::create_multiuser_record(
             context,
@@ -2067,9 +2049,8 @@ async fn apply_group_changes(
             || match mime_parser.get_header(HeaderDef::InReplyTo) {
                 // If we don't know the referenced message, we missed some messages.
                 // Maybe they added/removed members, so we need to recreate our member list.
-                Some(reply_to) => rfc724_mid_exists_ex(context, reply_to, "download_state=0")
+                Some(reply_to) => rfc724_mid_exists_and(context, reply_to, "download_state=0")
                     .await?
-                    .filter(|(_, _, downloaded)| *downloaded)
                     .is_none(),
                 None => false,
             }
@@ -2140,15 +2121,15 @@ async fn apply_group_changes(
         }
     } else if let Some(old_name) = mime_parser
         .get_header(HeaderDef::ChatGroupNameChanged)
+        // See create_or_lookup_group() for explanation
         .map(|s| s.trim())
     {
         if let Some(grpname) = mime_parser
             .get_header(HeaderDef::ChatGroupName)
+            // See create_or_lookup_group() for explanation
             .map(|grpname| grpname.trim())
             .filter(|grpname| grpname.len() < 200)
         {
-            let grpname = &sanitize_single_line(grpname);
-            let old_name = &sanitize_single_line(old_name);
             if chat_id
                 .update_timestamp(
                     context,
@@ -2160,7 +2141,10 @@ async fn apply_group_changes(
                 info!(context, "Updating grpname for chat {chat_id}.");
                 context
                     .sql
-                    .execute("UPDATE chats SET name=? WHERE id=?;", (grpname, chat_id))
+                    .execute(
+                        "UPDATE chats SET name=? WHERE id=?;",
+                        (strip_rtlo_characters(grpname), chat_id),
+                    )
                     .await?;
                 send_event_chat_modified = true;
             }
@@ -2433,7 +2417,7 @@ fn compute_mailinglist_name(
         }
     }
 
-    sanitize_single_line(&name)
+    strip_rtlo_characters(&name)
 }
 
 /// Set ListId param on the contact and ListPost param the chat.
@@ -2513,7 +2497,7 @@ async fn create_adhoc_group(
     from_id: ContactId,
     to_ids: &[ContactId],
     is_partial_download: bool,
-) -> Result<Option<(ChatId, Blocked)>> {
+) -> Result<Option<ChatId>> {
     if is_partial_download {
         // Partial download may be an encrypted message with protected Subject header.
         //
@@ -2552,24 +2536,15 @@ async fn create_adhoc_group(
         );
         return Ok(None);
     }
-    if mime_parser
-        .get_header(HeaderDef::ChatGroupMemberRemoved)
-        .is_some()
-    {
-        info!(
-            context,
-            "Message removes member from unknown ad-hoc group (TRASH)."
-        );
-        return Ok(Some((DC_CHAT_ID_TRASH, Blocked::Not)));
-    }
+
     if member_ids.len() < 3 {
         return Ok(None);
     }
 
+    // use subject as initial chat name
     let grpname = mime_parser
         .get_subject()
-        .map(|s| remove_subject_prefix(&s))
-        .unwrap_or_else(|| "👥📧".to_string());
+        .unwrap_or_else(|| "Unnamed group".to_string());
 
     let new_chat_id: ChatId = ChatId::create_multiuser_record(
         context,
@@ -2593,7 +2568,7 @@ async fn create_adhoc_group(
     chatlist_events::emit_chatlist_changed(context);
     chatlist_events::emit_chatlist_item_changed(context, new_chat_id);
 
-    Ok(Some((new_chat_id, create_blocked)))
+    Ok(Some(new_chat_id))
 }
 
 #[derive(Debug, PartialEq, Eq)]
@@ -2817,35 +2792,53 @@ async fn get_previous_message(
     Ok(None)
 }
 
+/// Given a list of Message-IDs, returns the latest message found in the database.
+///
+/// Only messages that are not in the trash chat are considered.
+async fn get_rfc724_mid_in_list(context: &Context, mid_list: &str) -> Result<Option<Message>> {
+    message::get_latest_by_rfc724_mids(context, &parse_message_ids(mid_list)).await
+}
+
 /// Returns the last message referenced from References: header found in the database.
 ///
 /// If none found, tries In-Reply-To: as a fallback for classic MUAs that don't set the
 /// References: header.
 async fn get_parent_message(
     context: &Context,
-    references: Option<&str>,
-    in_reply_to: Option<&str>,
+    mime_parser: &MimeMessage,
 ) -> Result<Option<Message>> {
-    let mut mids = Vec::new();
-    if let Some(field) = in_reply_to {
-        mids = parse_message_ids(field);
+    if let Some(field) = mime_parser.get_header(HeaderDef::References) {
+        if let Some(msg) = get_rfc724_mid_in_list(context, field).await? {
+            return Ok(Some(msg));
+        }
     }
-    if let Some(field) = references {
-        mids.append(&mut parse_message_ids(field));
+
+    if let Some(field) = mime_parser.get_header(HeaderDef::InReplyTo) {
+        if let Some(msg) = get_rfc724_mid_in_list(context, field).await? {
+            return Ok(Some(msg));
+        }
     }
-    message::get_by_rfc724_mids(context, &mids).await
+
+    Ok(None)
 }
 
 pub(crate) async fn get_prefetch_parent_message(
     context: &Context,
     headers: &[mailparse::MailHeader<'_>],
 ) -> Result<Option<Message>> {
-    get_parent_message(
-        context,
-        headers.get_header_value(HeaderDef::References).as_deref(),
-        headers.get_header_value(HeaderDef::InReplyTo).as_deref(),
-    )
-    .await
+    if let Some(field) = headers.get_header_value(HeaderDef::References) {
+        if let Some(msg) = get_rfc724_mid_in_list(context, &field).await? {
+            return Ok(Some(msg));
+        }
+    }
+
+    if let Some(field) = headers.get_header_value(HeaderDef::InReplyTo) {
+        if let Some(msg) = get_rfc724_mid_in_list(context, &field).await? {
+            return Ok(Some(msg));
+        }
+    }
+
+    Ok(None)
 }
 
 /// Looks up contact IDs from the database given the list of recipients.
@@ -2864,9 +2857,8 @@ async fn add_or_lookup_contacts_by_address_list(
         }
         let display_name = info.display_name.as_deref();
         if let Ok(addr) = ContactAddress::new(addr) {
-            let (contact_id, _) =
-                Contact::add_or_lookup(context, display_name.unwrap_or_default(), &addr, origin)
-                    .await?;
+            let contact_id =
+                add_or_lookup_contact_by_addr(context, display_name, addr, origin).await?;
             contact_ids.insert(contact_id);
         } else {
             warn!(context, "Contact with address {:?} cannot exist.", addr);
@@ -2876,5 +2868,22 @@ async fn add_or_lookup_contacts_by_address_list(
     Ok(contact_ids.into_iter().collect::<Vec<ContactId>>())
 }
 
+/// Add contacts to database on receiving messages.
+async fn add_or_lookup_contact_by_addr(
+    context: &Context,
+    display_name: Option<&str>,
+    addr: ContactAddress,
+    origin: Origin,
+) -> Result<ContactId> {
+    if context.is_self_addr(&addr).await? {
+        return Ok(ContactId::SELF);
+    }
+    let display_name_normalized = display_name.map(normalize_name).unwrap_or_default();
+
+    let (contact_id, _modified) =
+        Contact::add_or_lookup(context, &display_name_normalized, &addr, origin).await?;
+    Ok(contact_id)
+}
+
 #[cfg(test)]
 mod tests;

src/receive_imf/tests.rs

@@ -10,12 +10,11 @@ use crate::chat::{
 };
 use crate::chatlist::Chatlist;
 use crate::constants::{DC_GCL_FOR_FORWARDING, DC_GCL_NO_SPECIALS};
-use crate::contact;
 use crate::download::MIN_DOWNLOAD_LIMIT;
 use crate::imap::prefetch_should_download;
 use crate::imex::{imex, ImexMode};
-use crate::test_utils::{get_chat_msg, mark_as_verified, TestContext, TestContextManager};
-use crate::tools::{time, SystemTime};
+use crate::test_utils::{get_chat_msg, TestContext, TestContextManager};
+use crate::tools::SystemTime;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_outgoing() -> Result<()> {
@@ -2043,7 +2042,7 @@ async fn test_dont_assign_to_trash_by_parent() {
     assert_eq!(msg.text, "Hi – hello");
 
     println!("\n========= Delete the message ==========");
-    msg.id.trash(&t, false).await.unwrap();
+    msg.id.trash(&t).await.unwrap();
 
     let msgs = chat::get_chat_msgs(&t.ctx, chat_id).await.unwrap();
     assert_eq!(msgs.len(), 0);
@@ -2094,18 +2093,6 @@ Message content",
     assert_ne!(msg.chat_id, t.get_self_chat().await.id);
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_no_unencrypted_name_in_self_chat() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let bob = &tcm.bob().await;
-    bob.set_config(Config::Displayname, Some("Bob Smith"))
-        .await?;
-    let chat_id = bob.get_self_chat().await.id;
-    let msg = bob.send_text(chat_id, "Happy birthday to me").await;
-    assert_eq!(msg.payload.contains("Bob Smith"), false);
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_outgoing_classic_mail_creates_chat() {
     let alice = TestContext::new_alice().await;
@@ -2812,13 +2799,8 @@ async fn test_read_receipts_dont_create_chats() -> Result<()> {
     assert_eq!(chats.len(), 0);
 
     // Bob sends a read receipt.
-    let mdn_mimefactory = crate::mimefactory::MimeFactory::from_mdn(
-        &bob,
-        received_msg.from_id,
-        received_msg.rfc724_mid,
-        vec![],
-    )
-    .await?;
+    let mdn_mimefactory =
+        crate::mimefactory::MimeFactory::from_mdn(&bob, &received_msg, vec![]).await?;
     let rendered_mdn = mdn_mimefactory.render(&bob).await?;
     let mdn_body = rendered_mdn.message;
 
@@ -2847,13 +2829,8 @@ async fn test_read_receipts_dont_unmark_bots() -> Result<()> {
     let received_msg = bob.get_last_msg().await;
 
     // Bob sends a read receipt.
-    let mdn_mimefactory = crate::mimefactory::MimeFactory::from_mdn(
-        bob,
-        received_msg.from_id,
-        received_msg.rfc724_mid,
-        vec![],
-    )
-    .await?;
+    let mdn_mimefactory =
+        crate::mimefactory::MimeFactory::from_mdn(bob, &received_msg, vec![]).await?;
     let rendered_mdn = mdn_mimefactory.render(bob).await?;
     let mdn_body = rendered_mdn.message;
 
@@ -2909,18 +2886,6 @@ async fn test_incoming_contact_request() -> Result<()> {
     }
 }
 
-async fn get_parent_message(
-    context: &Context,
-    mime_parser: &MimeMessage,
-) -> Result<Option<Message>> {
-    super::get_parent_message(
-        context,
-        mime_parser.get_header(HeaderDef::References),
-        mime_parser.get_header(HeaderDef::InReplyTo),
-    )
-    .await
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_get_parent_message() -> Result<()> {
     let t = TestContext::new_alice().await;
@@ -3298,62 +3263,6 @@ async fn test_send_as_bot() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_bot_recv_existing_msg() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let bob = &tcm.bob().await;
-    bob.set_config(Config::Bot, Some("1")).await.unwrap();
-    bob.set_config(Config::FetchExistingMsgs, Some("1"))
-        .await
-        .unwrap();
-    let fetching_existing_messages = true;
-    let msg = receive_imf_from_inbox(
-        bob,
-        "first@example.org",
-        b"From: Alice <alice@example.org>\n\
-          To: Bob <bob@example.net>\n\
-          Chat-Version: 1.0\n\
-          Message-ID: <first@example.org>\n\
-          Date: Sun, 14 Nov 2021 00:10:00 +0000\n\
-          Content-Type: text/plain\n\
-          \n\
-          hello\n",
-        false,
-        None,
-        fetching_existing_messages,
-    )
-    .await?
-    .unwrap();
-    let msg = Message::load_from_db(bob, msg.msg_ids[0]).await?;
-    assert_eq!(msg.state, MessageState::InFresh);
-    let event = bob
-        .evtracker
-        .get_matching(|ev| matches!(ev, EventType::IncomingMsg { .. }))
-        .await;
-    let EventType::IncomingMsg { chat_id, msg_id } = event else {
-        unreachable!();
-    };
-    assert_eq!(chat_id, msg.chat_id);
-    assert_eq!(msg_id, msg.id);
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_wrong_date_in_imf_section() {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let alice_chat_id = tcm.send_recv_accept(bob, alice, "hi").await.chat_id;
-    let time_before_sending = time();
-    let mut sent_msg = alice.send_text(alice_chat_id, "hi").await;
-    sent_msg.payload = sent_msg.payload.replace(
-        "Date:",
-        "Date: Tue, 29 Feb 1972 22:37:57 +0000\nX-Microsoft-Original-Date:",
-    );
-    let msg = bob.recv_msg(&sent_msg).await;
-    assert!(msg.timestamp_sent >= time_before_sending);
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_no_private_reply_to_blocked_account() -> Result<()> {
     let mut tcm = TestContextManager::new();
@@ -3559,39 +3468,6 @@ async fn test_prefer_encrypt_mutual_if_encrypted() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_forged_from_and_no_valid_signatures() -> Result<()> {
-    let t = &TestContext::new_bob().await;
-    let raw = include_bytes!("../../test-data/message/thunderbird_encrypted_signed.eml");
-    let received_msg = receive_imf(t, raw, false).await?.unwrap();
-    assert!(!received_msg.from_is_signed);
-    let msg = t.get_last_msg().await;
-    assert!(!msg.chat_id.is_trash());
-    assert!(!msg.get_showpadlock());
-
-    let t = &TestContext::new_bob().await;
-    let raw = String::from_utf8(raw.to_vec())?.replace("alice@example.org", "clarice@example.org");
-    let received_msg = receive_imf(t, raw.as_bytes(), false).await?.unwrap();
-    assert!(received_msg.chat_id.is_trash());
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_wrong_from_name_and_no_valid_signatures() -> Result<()> {
-    let t = &TestContext::new_bob().await;
-    let raw = include_bytes!("../../test-data/message/thunderbird_encrypted_signed.eml");
-    let raw = String::from_utf8(raw.to_vec())?.replace("From: Alice", "From: A");
-    let received_msg = receive_imf(t, raw.as_bytes(), false).await?.unwrap();
-    assert!(!received_msg.from_is_signed);
-    let msg = t.get_last_msg().await;
-    assert!(!msg.chat_id.is_trash());
-    assert!(!msg.get_showpadlock());
-    let contact = Contact::get_by_id(t, msg.from_id).await?;
-    assert_eq!(contact.get_authname(), "Alice");
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_thunderbird_autocrypt_unencrypted() -> Result<()> {
     let t = TestContext::new_bob().await;
@@ -4047,7 +3923,6 @@ async fn test_dont_readd_with_normal_msg() -> Result<()> {
     bob_chat_id.accept(&bob).await?;
 
     remove_contact_from_chat(&bob, bob_chat_id, ContactId::SELF).await?;
-    bob.pop_sent_msg().await;
     assert_eq!(get_chat_contacts(&bob, bob_chat_id).await?.len(), 1);
 
     SystemTime::shift(Duration::from_secs(3600));
@@ -4210,7 +4085,6 @@ async fn test_mua_can_readd() -> Result<()> {
 
     // And leaves it.
     remove_contact_from_chat(&alice, alice_chat.id, ContactId::SELF).await?;
-    alice.pop_sent_msg().await;
     assert!(!is_contact_in_chat(&alice, alice_chat.id, ContactId::SELF).await?);
 
     // Bob uses a classical MUA to answer, adding Alice back.
@@ -4285,7 +4159,6 @@ async fn test_recreate_member_list_on_missing_add_of_self() -> Result<()> {
     // But if Bob just left, they mustn't recreate the member list even after missing a message.
     bob_chat_id.accept(&bob).await?;
     remove_contact_from_chat(&bob, bob_chat_id, ContactId::SELF).await?;
-    bob.pop_sent_msg().await;
     send_text_msg(&alice, alice_chat_id, "3rd message".to_string()).await?;
     alice.pop_sent_msg().await;
     send_text_msg(&alice, alice_chat_id, "4th message".to_string()).await?;
@@ -4339,33 +4212,6 @@ async fn test_keep_member_list_if_possibly_nomember() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_adhoc_grp_name_no_prefix() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let chat_id = receive_imf(
-        alice,
-        b"Subject: Re: Once upon a time this was with the only Re: here\n\
-          From: <bob@example.net>\n\
-          To: <claire@example.org>, <alice@example.org>\n\
-          Date: Mon, 12 Dec 3000 14:32:39 +0000\n\
-          Message-ID: <thisone@example.net>\n\
-          In-Reply-To: <previous@example.net>\n\
-          \n\
-          Adding Alice the Delta Chat lover",
-        false,
-    )
-    .await?
-    .unwrap()
-    .chat_id;
-    let chat = Chat::load_from_db(alice, chat_id).await.unwrap();
-    assert_eq!(
-        chat.get_name(),
-        "Once upon a time this was with the only Re: here"
-    );
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_download_later() -> Result<()> {
     let mut tcm = TestContextManager::new();
@@ -4618,140 +4464,6 @@ Chat-Group-Member-Added: charlie@example.com",
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_leave_protected_group_missing_member_key() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    mark_as_verified(alice, bob).await;
-    let alice_bob_id = alice.add_or_lookup_contact(bob).await.id;
-    let group_id = create_group_chat(alice, ProtectionStatus::Protected, "Group").await?;
-    add_contact_to_chat(alice, group_id, alice_bob_id).await?;
-    alice.send_text(group_id, "Hello!").await;
-    alice
-        .sql
-        .execute(
-            "UPDATE acpeerstates SET addr=? WHERE addr=?",
-            ("b@b", "bob@example.net"),
-        )
-        .await?;
-    assert!(remove_contact_from_chat(alice, group_id, ContactId::SELF)
-        .await
-        .is_err());
-    assert!(is_contact_in_chat(alice, group_id, ContactId::SELF).await?);
-    alice
-        .sql
-        .execute(
-            "UPDATE acpeerstates SET addr=? WHERE addr=?",
-            ("bob@example.net", "b@b"),
-        )
-        .await?;
-    remove_contact_from_chat(alice, group_id, ContactId::SELF).await?;
-    alice.pop_sent_msg().await;
-    assert!(!is_contact_in_chat(alice, group_id, ContactId::SELF).await?);
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_protected_group_add_remove_member_missing_key() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let bob_addr = bob.get_config(Config::Addr).await?.unwrap();
-    mark_as_verified(alice, bob).await;
-    let group_id = create_group_chat(alice, ProtectionStatus::Protected, "Group").await?;
-    let alice_bob_id = alice.add_or_lookup_contact(bob).await.id;
-    add_contact_to_chat(alice, group_id, alice_bob_id).await?;
-    alice.send_text(group_id, "Hello!").await;
-    alice
-        .sql
-        .execute("DELETE FROM acpeerstates WHERE addr=?", (&bob_addr,))
-        .await?;
-
-    let fiona = &tcm.fiona().await;
-    mark_as_verified(alice, fiona).await;
-    let alice_fiona_id = alice.add_or_lookup_contact(fiona).await.id;
-    assert!(add_contact_to_chat(alice, group_id, alice_fiona_id)
-        .await
-        .is_err());
-    assert!(!is_contact_in_chat(alice, group_id, alice_fiona_id).await?);
-    // Now the chat has a message "You added member fiona@example.net. [INFO] !!" (with error) that
-    // may be confusing, but if the error is displayed in UIs, it's more or less ok. This is not a
-    // normal scenario anyway.
-
-    remove_contact_from_chat(alice, group_id, alice_bob_id).await?;
-    assert!(!is_contact_in_chat(alice, group_id, alice_bob_id).await?);
-    let msg = alice.get_last_msg_in(group_id).await;
-    assert!(msg.is_info());
-    assert_eq!(
-        msg.get_text(),
-        stock_str::msg_del_member_local(alice, &bob_addr, ContactId::SELF,).await
-    );
-    assert!(msg.error().is_some());
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_dont_create_adhoc_group_on_member_removal() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let bob = &tcm.bob().await;
-    async fn get_chat_cnt(ctx: &Context) -> Result<usize> {
-        ctx.sql
-            .count("SELECT COUNT(*) FROM chats WHERE id>9", ())
-            .await
-    }
-    let chat_cnt = get_chat_cnt(bob).await?;
-    receive_imf(
-        bob,
-        b"From: Alice <alice@example.org>\n\
-To: <bob@example.net>, <charlie@example.com>\n\
-Chat-Version: 1.0\n\
-Subject: subject\n\
-Message-ID: <first@example.org>\n\
-Date: Sun, 14 Nov 2021 00:10:00 +0000\
-Content-Type: text/plain
-Chat-Group-Member-Removed: charlie@example.com",
-        false,
-    )
-    .await?;
-    assert_eq!(get_chat_cnt(bob).await?, chat_cnt);
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_unarchive_on_member_removal() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let bob_id = Contact::create(alice, "", "bob@example.net").await?;
-    let fiona_id = Contact::create(alice, "", "fiona@example.net").await?;
-    let alice_chat_id = create_group_chat(alice, ProtectionStatus::Unprotected, "foos").await?;
-    add_contact_to_chat(alice, alice_chat_id, bob_id).await?;
-    add_contact_to_chat(alice, alice_chat_id, fiona_id).await?;
-
-    send_text_msg(alice, alice_chat_id, "populate".to_string()).await?;
-    let msg = alice.pop_sent_msg().await;
-    bob.recv_msg(&msg).await;
-    let bob_chat_id = bob.get_last_msg().await.chat_id;
-    bob_chat_id
-        .set_visibility(bob, ChatVisibility::Archived)
-        .await?;
-
-    remove_contact_from_chat(alice, alice_chat_id, fiona_id).await?;
-    let msg = alice.pop_sent_msg().await;
-    bob.recv_msg(&msg).await;
-    let bob_chat = Chat::load_from_db(bob, bob_chat_id).await?;
-    assert_eq!(bob_chat.get_visibility(), ChatVisibility::Archived);
-
-    remove_contact_from_chat(alice, alice_chat_id, bob_id).await?;
-    let msg = alice.pop_sent_msg().await;
-    bob.recv_msg(&msg).await;
-    let bob_chat = Chat::load_from_db(bob, bob_chat_id).await?;
-    assert_eq!(bob_chat.get_visibility(), ChatVisibility::Normal);
-
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_forged_from() -> Result<()> {
     let mut tcm = TestContextManager::new();
@@ -4835,50 +4547,6 @@ async fn test_references() -> Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_prefer_references_to_downloaded_msgs() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    bob.set_config(Config::DownloadLimit, Some("1")).await?;
-    let fiona = &tcm.fiona().await;
-    let alice_bob_id = tcm.send_recv(bob, alice, "hi").await.from_id;
-    let alice_fiona_id = tcm.send_recv(fiona, alice, "hi").await.from_id;
-    let alice_chat_id = create_group_chat(alice, ProtectionStatus::Unprotected, "Group").await?;
-    add_contact_to_chat(alice, alice_chat_id, alice_bob_id).await?;
-    // W/o fiona the test doesn't work -- the last message is assigned to the 1:1 chat due to
-    // `is_probably_private_reply()`.
-    add_contact_to_chat(alice, alice_chat_id, alice_fiona_id).await?;
-    let sent = alice.send_text(alice_chat_id, "Hi").await;
-    let received = bob.recv_msg(&sent).await;
-    assert_eq!(received.download_state, DownloadState::Done);
-    let bob_chat_id = received.chat_id;
-
-    let file_bytes = include_bytes!("../../test-data/image/screenshot.gif");
-    let mut msg = Message::new(Viewtype::File);
-    msg.set_file_from_bytes(alice, "file", file_bytes, None)
-        .await?;
-    let mut sent = alice.send_msg(alice_chat_id, &mut msg).await;
-    sent.payload = sent
-        .payload
-        .replace("References:", "X-Microsoft-Original-References:")
-        .replace("In-Reply-To:", "X-Microsoft-Original-In-Reply-To:");
-    let received = bob.recv_msg(&sent).await;
-    assert_eq!(received.download_state, DownloadState::Available);
-    assert_ne!(received.chat_id, bob_chat_id);
-    assert_eq!(received.chat_id, bob.get_chat(alice).await.id);
-
-    let mut msg = Message::new(Viewtype::File);
-    msg.set_file_from_bytes(alice, "file", file_bytes, None)
-        .await?;
-    let sent = alice.send_msg(alice_chat_id, &mut msg).await;
-    let received = bob.recv_msg(&sent).await;
-    assert_eq!(received.download_state, DownloadState::Available);
-    assert_eq!(received.chat_id, bob_chat_id);
-
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_list_from() -> Result<()> {
     let t = &TestContext::new_alice().await;
@@ -4904,15 +4572,10 @@ async fn test_receive_vcard() -> Result<()> {
     let alice = tcm.alice().await;
     let bob = tcm.bob().await;
 
-    async fn test(
-        alice: &TestContext,
-        bob: &TestContext,
-        vcard_contains_address: bool,
-        viewtype: Viewtype,
-    ) -> Result<()> {
-        let mut msg = Message::new(viewtype);
+    for vcard_contains_address in [true, false] {
+        let mut msg = Message::new(Viewtype::Vcard);
         msg.set_file_from_bytes(
-            alice,
+            &alice,
             "claire.vcf",
             format!(
                 "BEGIN:VCARD\n\
@@ -4932,24 +4595,19 @@ async fn test_receive_vcard() -> Result<()> {
         .await
         .unwrap();
 
-        let alice_bob_chat = alice.create_chat(bob).await;
+        let alice_bob_chat = alice.create_chat(&bob).await;
         let sent = alice.send_msg(alice_bob_chat.id, &mut msg).await;
         let rcvd = bob.recv_msg(&sent).await;
-        let sent = Message::load_from_db(alice, sent.sender_msg_id).await?;
 
         if vcard_contains_address {
-            assert_eq!(sent.viewtype, Viewtype::Vcard);
-            assert_eq!(sent.get_summary_text(alice).await, "👤 Claire");
             assert_eq!(rcvd.viewtype, Viewtype::Vcard);
-            assert_eq!(rcvd.get_summary_text(bob).await, "👤 Claire");
         } else {
             // VCards without an email address are not "deltachat contacts",
             // so they are shown as files
-            assert_eq!(sent.viewtype, Viewtype::File);
             assert_eq!(rcvd.viewtype, Viewtype::File);
         }
 
-        let vcard = tokio::fs::read(rcvd.get_file(bob).unwrap()).await?;
+        let vcard = tokio::fs::read(rcvd.get_file(&bob).unwrap()).await?;
         let vcard = std::str::from_utf8(&vcard)?;
         let parsed = deltachat_contact_tools::parse_vcard(vcard);
         assert_eq!(parsed.len(), 1);
@@ -4958,113 +4616,27 @@ async fn test_receive_vcard() -> Result<()> {
         } else {
             assert_eq!(&parsed[0].addr, "");
         }
-        Ok(())
     }
 
-    for vcard_contains_address in [true, false] {
-        for viewtype in [Viewtype::File, Viewtype::Vcard] {
-            test(&alice, &bob, vcard_contains_address, viewtype).await?;
-        }
-    }
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_make_n_send_vcard() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob = &tcm.bob().await;
-    let vcard = "BEGIN:VCARD\n\
-         VERSION:4.0\n\
-         FN:Claire\n\
-         EMAIL;TYPE=work:claire@example.org\n\
-         END:VCARD";
-    let contact_ids = contact::import_vcard(alice, vcard).await?;
-    assert_eq!(contact_ids.len(), 1);
-
-    let mut msg = Message::new(Viewtype::File);
-    msg.make_vcard(alice, &contact_ids).await?;
-
-    let alice_bob_chat = alice.create_chat(bob).await;
-    let sent = alice.send_msg(alice_bob_chat.id, &mut msg).await;
-    let rcvd = bob.recv_msg(&sent).await;
-    let sent = Message::load_from_db(alice, sent.sender_msg_id).await?;
-
-    assert_eq!(sent.viewtype, Viewtype::Vcard);
-    assert_eq!(sent.get_summary_text(alice).await, "👤 Claire");
-    assert_eq!(rcvd.viewtype, Viewtype::Vcard);
-    assert_eq!(rcvd.get_summary_text(bob).await, "👤 Claire");
-
-    let vcard = tokio::fs::read(rcvd.get_file(bob).unwrap()).await?;
-    let vcard = std::str::from_utf8(&vcard)?;
-    let parsed = deltachat_contact_tools::parse_vcard(vcard);
-    assert_eq!(parsed.len(), 1);
-    assert_eq!(&parsed[0].addr, "claire@example.org");
-
     Ok(())
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_group_no_recipients() -> Result<()> {
     let t = &TestContext::new_alice().await;
-    let raw = "From: alice@example.org
-Subject: Group
-Chat-Version: 1.0
-Chat-Group-Name: Group
- name\u{202B}
-Chat-Group-ID: GePFDkwEj2K
-Message-ID: <foobar@localhost>
-
-Hello!"
-        .as_bytes();
+    let raw = b"From: alice@example.org\n\
+                    Subject: Group\n\
+                    Chat-Version: 1.0\n\
+                    Chat-Group-Name: Group\n\
+                    Chat-Group-ID: GePFDkwEj2K\n\
+                    Message-ID: <foobar@localhost>\n\
+                    \n\
+                    Hello!";
     let received = receive_imf(t, raw, false).await?.unwrap();
     let msg = Message::load_from_db(t, *received.msg_ids.last().unwrap()).await?;
     let chat = Chat::load_from_db(t, msg.chat_id).await?;
     assert_eq!(chat.typ, Chattype::Group);
 
-    // Check that the weird group name is sanitzied correctly:
-    let mail = mailparse::parse_mail(raw).unwrap();
-    assert_eq!(
-        mail.headers
-            .get_header(HeaderDef::ChatGroupName)
-            .unwrap()
-            .get_value_raw(),
-        "Group\n name\u{202B}".as_bytes()
-    );
-    assert_eq!(chat.name, "Group name");
-
-    Ok(())
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_group_name_with_newline() -> Result<()> {
-    let t = &TestContext::new_alice().await;
-    let raw = "From: alice@example.org
-Subject: Group
-Chat-Version: 1.0
-Chat-Group-Name: =?utf-8?q?Delta=0D=0AChat?=
-Chat-Group-ID: GePFDkwEj2K
-Message-ID: <foobar@localhost>
-
-Hello!"
-        .as_bytes();
-    let received = receive_imf(t, raw, false).await?.unwrap();
-    let msg = Message::load_from_db(t, *received.msg_ids.last().unwrap()).await?;
-    let chat = Chat::load_from_db(t, msg.chat_id).await?;
-    assert_eq!(chat.typ, Chattype::Group);
-
-    // Check that the weird group name is sanitzied correctly:
-    let mail = mailparse::parse_mail(raw).unwrap();
-    assert_eq!(
-        mail.headers
-            .get_header(HeaderDef::ChatGroupName)
-            .unwrap()
-            .get_value(),
-        "Delta\r\nChat"
-    );
-    assert_eq!(chat.name, "Delta  Chat");
-
     Ok(())
 }
 

src/scheduler.rs

@@ -2,6 +2,7 @@ use std::cmp;
 use std::iter::{self, once};
 use std::num::NonZeroUsize;
 use std::sync::atomic::Ordering;
+use std::time::Duration;
 
 use anyhow::{bail, Context as _, Error, Result};
 use async_channel::{self as channel, Receiver, Sender};
@@ -472,7 +473,14 @@ async fn inbox_fetch_idle(ctx: &Context, imap: &mut Imap, mut session: Session)
     .await?;
 
     // Update quota no more than once a minute.
-    if ctx.quota_needs_update(60).await {
+    let quota_needs_update = {
+        let quota = ctx.quota.read().await;
+        quota
+            .as_ref()
+            .filter(|quota| time_elapsed(&quota.modified) > Duration::from_secs(60))
+            .is_none()
+    };
+    if quota_needs_update {
         if let Err(err) = ctx.update_recent_quota(&mut session).await {
             warn!(ctx, "Failed to update quota: {:#}.", err);
         }
@@ -741,7 +749,7 @@ async fn smtp_loop(
 ) {
     use futures::future::FutureExt;
 
-    info!(ctx, "Starting SMTP loop.");
+    info!(ctx, "starting smtp loop");
     let SmtpConnectionHandlers {
         mut connection,
         stop_receiver,
@@ -752,14 +760,14 @@ async fn smtp_loop(
     let fut = async move {
         let ctx = ctx1;
         if let Err(()) = started.send(()) {
-            warn!(&ctx, "SMTP loop, missing started receiver.");
+            warn!(&ctx, "smtp loop, missing started receiver");
             return;
         }
 
         let mut timeout = None;
         loop {
             if let Err(err) = send_smtp_messages(&ctx, &mut connection).await {
-                warn!(ctx, "send_smtp_messages failed: {:#}.", err);
+                warn!(ctx, "send_smtp_messages failed: {:#}", err);
                 timeout = Some(timeout.unwrap_or(30));
             } else {
                 timeout = None;
@@ -776,7 +784,7 @@ async fn smtp_loop(
             }
 
             // Fake Idle
-            info!(ctx, "SMTP fake idle started.");
+            info!(ctx, "smtp fake idle - started");
             match &connection.last_send_error {
                 None => connection.connectivity.set_idle(&ctx).await,
                 Some(err) => connection.connectivity.set_err(&ctx, err).await,
@@ -790,7 +798,7 @@ async fn smtp_loop(
                 let now = tools::Time::now();
                 info!(
                     ctx,
-                    "SMTP has messages to retry, planning to retry {t} seconds later."
+                    "smtp has messages to retry, planning to retry {} seconds later", t,
                 );
                 let duration = std::time::Duration::from_secs(t);
                 tokio::time::timeout(duration, async {
@@ -804,18 +812,18 @@ async fn smtp_loop(
                     slept.saturating_add(rand::thread_rng().gen_range((slept / 2)..=slept)),
                 ));
             } else {
-                info!(ctx, "SMTP has no messages to retry, waiting for interrupt.");
+                info!(ctx, "smtp has no messages to retry, waiting for interrupt");
                 idle_interrupt_receiver.recv().await.unwrap_or_default();
             };
 
-            info!(ctx, "SMTP fake idle interrupted.")
+            info!(ctx, "smtp fake idle - interrupted")
         }
     };
 
     stop_receiver
         .recv()
         .map(|_| {
-            info!(ctx, "Shutting down SMTP loop.");
+            info!(ctx, "shutting down smtp loop");
         })
         .race(fut)
         .await;

src/securejoin.rs

@@ -98,7 +98,6 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
         let group_name_urlencoded = utf8_percent_encode(group_name, NON_ALPHANUMERIC).to_string();
         if sync_token {
             context.sync_qr_code_tokens(Some(chat.id)).await?;
-            context.scheduler.interrupt_smtp().await;
         }
         format!(
             "OPENPGP4FPR:{}#a={}&g={}&x={}&i={}&s={}",
@@ -113,7 +112,6 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
         // parameters used: a=n=i=s=
         if sync_token {
             context.sync_qr_code_tokens(None).await?;
-            context.scheduler.interrupt_smtp().await;
         }
         format!(
             "OPENPGP4FPR:{}#a={}&n={}&i={}&s={}",
@@ -804,9 +802,6 @@ mod tests {
         let alice = tcm.alice().await;
         let alice_addr = &alice.get_config(Config::Addr).await.unwrap().unwrap();
         let bob = tcm.bob().await;
-        bob.set_config(Config::Displayname, Some("Bob Examplenet"))
-            .await
-            .unwrap();
         alice
             .set_config(Config::VerifiedOneOnOneChats, Some("1"))
             .await
@@ -829,11 +824,6 @@ mod tests {
 
         // Step 1: Generate QR-code, ChatId(0) indicates setup-contact
         let qr = get_securejoin_qr(&alice.ctx, None).await.unwrap();
-        // We want Bob to learn Alice's name from their messages, not from the QR code.
-        alice
-            .set_config(Config::Displayname, Some("Alice Exampleorg"))
-            .await
-            .unwrap();
 
         // Step 2: Bob scans QR-code, sends vc-request
         join_securejoin(&bob.ctx, &qr).await.unwrap();
@@ -905,7 +895,6 @@ mod tests {
 
         // Check Bob sent the right message.
         let sent = bob.pop_sent_msg().await;
-        assert!(!sent.payload.contains("Bob Examplenet"));
         let mut msg = alice.parse_msg(&sent).await;
         let vc_request_with_auth_ts_sent = msg
             .get_header(HeaderDef::Date)
@@ -957,7 +946,6 @@ mod tests {
             .await
             .unwrap();
         assert_eq!(contact_bob.is_verified(&alice.ctx).await.unwrap(), false);
-        assert_eq!(contact_bob.get_authname(), "");
 
         if case == SetupContactCase::CheckProtectionTimestamp {
             SystemTime::shift(Duration::from_secs(3600));
@@ -966,10 +954,6 @@ mod tests {
         // Step 5+6: Alice receives vc-request-with-auth, sends vc-contact-confirm
         alice.recv_msg_trash(&sent).await;
         assert_eq!(contact_bob.is_verified(&alice.ctx).await.unwrap(), true);
-        let contact_bob = Contact::get_by_id(&alice.ctx, contact_bob_id)
-            .await
-            .unwrap();
-        assert_eq!(contact_bob.get_authname(), "Bob Examplenet");
 
         // exactly one one-to-one chat should be visible for both now
         // (check this before calling alice.create_chat() explicitly below)
@@ -997,19 +981,8 @@ mod tests {
             }
         }
 
-        // Make sure Alice hasn't yet sent their name to Bob.
-        let contact_alice_id = Contact::lookup_id_by_addr(&bob.ctx, alice_addr, Origin::Unknown)
-            .await
-            .expect("Error looking up contact")
-            .expect("Contact not found");
-        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id)
-            .await
-            .unwrap();
-        assert_eq!(contact_alice.get_authname(), "");
-
         // Check Alice sent the right message to Bob.
         let sent = alice.pop_sent_msg().await;
-        assert!(!sent.payload.contains("Alice Exampleorg"));
         let msg = bob.parse_msg(&sent).await;
         assert!(msg.was_encrypted());
         assert_eq!(
@@ -1018,15 +991,18 @@ mod tests {
         );
 
         // Bob should not yet have Alice verified
-        assert_eq!(contact_alice.is_verified(&bob.ctx).await.unwrap(), false);
+        let contact_alice_id = Contact::lookup_id_by_addr(&bob.ctx, alice_addr, Origin::Unknown)
+            .await
+            .expect("Error looking up contact")
+            .expect("Contact not found");
+        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id)
+            .await
+            .unwrap();
+        assert_eq!(contact_bob.is_verified(&bob.ctx).await.unwrap(), false);
 
         // Step 7: Bob receives vc-contact-confirm
         bob.recv_msg_trash(&sent).await;
         assert_eq!(contact_alice.is_verified(&bob.ctx).await.unwrap(), true);
-        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id)
-            .await
-            .unwrap();
-        assert_eq!(contact_alice.get_authname(), "Alice Exampleorg");
 
         if case != SetupContactCase::SecurejoinWaitTimeout {
             // Later we check that the timeout message isn't added to the already protected chat.
@@ -1143,7 +1119,7 @@ mod tests {
         // Alice should not yet have Bob verified
         let (contact_bob_id, _modified) = Contact::add_or_lookup(
             &alice.ctx,
-            "",
+            "Bob",
             &ContactAddress::new("bob@example.net")?,
             Origin::ManuallyCreated,
         )
@@ -1427,7 +1403,6 @@ First thread."#;
 
         let alice_bob_contact_id = Contact::create(&alice, "Bob", "bob@example.net").await?;
         remove_contact_from_chat(&alice, alice_chat_id, alice_bob_contact_id).await?;
-        alice.pop_sent_msg().await;
 
         // The message from Bob is delivered late, Bob is already removed.
         let msg = alice.recv_msg(&sent).await;

src/smtp.rs

@@ -1,11 +1,13 @@
 //! # SMTP transport module.
 
-mod connect;
 pub mod send;
 
+use std::time::Duration;
+
 use anyhow::{bail, format_err, Context as _, Error, Result};
 use async_smtp::response::{Category, Code, Detail};
 use async_smtp::{self as smtp, EmailAddress, SmtpTransport};
+use tokio::io::BufStream;
 use tokio::task;
 
 use crate::chat::{add_info_msg_with_cmd, ChatId};
@@ -17,14 +19,20 @@ use crate::login_param::{CertificateChecks, LoginParam, ServerLoginParam};
 use crate::message::Message;
 use crate::message::{self, MsgId};
 use crate::mimefactory::MimeFactory;
+use crate::net::connect_tcp;
 use crate::net::session::SessionBufStream;
+use crate::net::tls::wrap_tls;
 use crate::oauth2::get_oauth2_access_token;
+use crate::provider::Socket;
 use crate::scheduler::connectivity::ConnectivityStore;
 use crate::socks::Socks5Config;
 use crate::sql;
 use crate::stock_str::unencrypted_email;
 use crate::tools::{self, time_elapsed};
 
+/// SMTP connection, write and read timeout.
+const SMTP_TIMEOUT: Duration = Duration::from_secs(60);
+
 #[derive(Default)]
 pub(crate) struct Smtp {
     /// SMTP connection.
@@ -79,7 +87,7 @@ impl Smtp {
     /// Connect using configured parameters.
     pub async fn connect_configured(&mut self, context: &Context) -> Result<()> {
         if self.has_maybe_stale_connection() {
-            info!(context, "Closing stale connection.");
+            info!(context, "Closing stale connection");
             self.disconnect();
         }
 
@@ -101,6 +109,121 @@ impl Smtp {
         .await
     }
 
+    async fn connect_secure_socks5(
+        &self,
+        context: &Context,
+        hostname: &str,
+        port: u16,
+        strict_tls: bool,
+        socks5_config: Socks5Config,
+    ) -> Result<SmtpTransport<Box<dyn SessionBufStream>>> {
+        let socks5_stream = socks5_config
+            .connect(context, hostname, port, SMTP_TIMEOUT, strict_tls)
+            .await?;
+        let tls_stream = wrap_tls(strict_tls, hostname, socks5_stream).await?;
+        let buffered_stream = BufStream::new(tls_stream);
+        let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
+        let client = smtp::SmtpClient::new().smtp_utf8(true);
+        let transport = SmtpTransport::new(client, session_stream).await?;
+        Ok(transport)
+    }
+
+    async fn connect_starttls_socks5(
+        &self,
+        context: &Context,
+        hostname: &str,
+        port: u16,
+        strict_tls: bool,
+        socks5_config: Socks5Config,
+    ) -> Result<SmtpTransport<Box<dyn SessionBufStream>>> {
+        let socks5_stream = socks5_config
+            .connect(context, hostname, port, SMTP_TIMEOUT, strict_tls)
+            .await?;
+
+        // Run STARTTLS command and convert the client back into a stream.
+        let client = smtp::SmtpClient::new().smtp_utf8(true);
+        let transport = SmtpTransport::new(client, BufStream::new(socks5_stream)).await?;
+        let tcp_stream = transport.starttls().await?.into_inner();
+        let tls_stream = wrap_tls(strict_tls, hostname, tcp_stream)
+            .await
+            .context("STARTTLS upgrade failed")?;
+        let buffered_stream = BufStream::new(tls_stream);
+        let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
+        let client = smtp::SmtpClient::new().smtp_utf8(true).without_greeting();
+        let transport = SmtpTransport::new(client, session_stream).await?;
+        Ok(transport)
+    }
+
+    async fn connect_insecure_socks5(
+        &self,
+        context: &Context,
+        hostname: &str,
+        port: u16,
+        socks5_config: Socks5Config,
+    ) -> Result<SmtpTransport<Box<dyn SessionBufStream>>> {
+        let socks5_stream = socks5_config
+            .connect(context, hostname, port, SMTP_TIMEOUT, false)
+            .await?;
+        let buffered_stream = BufStream::new(socks5_stream);
+        let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
+        let client = smtp::SmtpClient::new().smtp_utf8(true);
+        let transport = SmtpTransport::new(client, session_stream).await?;
+        Ok(transport)
+    }
+
+    async fn connect_secure(
+        &self,
+        context: &Context,
+        hostname: &str,
+        port: u16,
+        strict_tls: bool,
+    ) -> Result<SmtpTransport<Box<dyn SessionBufStream>>> {
+        let tcp_stream = connect_tcp(context, hostname, port, SMTP_TIMEOUT, false).await?;
+        let tls_stream = wrap_tls(strict_tls, hostname, tcp_stream).await?;
+        let buffered_stream = BufStream::new(tls_stream);
+        let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
+        let client = smtp::SmtpClient::new().smtp_utf8(true);
+        let transport = SmtpTransport::new(client, session_stream).await?;
+        Ok(transport)
+    }
+
+    async fn connect_starttls(
+        &self,
+        context: &Context,
+        hostname: &str,
+        port: u16,
+        strict_tls: bool,
+    ) -> Result<SmtpTransport<Box<dyn SessionBufStream>>> {
+        let tcp_stream = connect_tcp(context, hostname, port, SMTP_TIMEOUT, strict_tls).await?;
+
+        // Run STARTTLS command and convert the client back into a stream.
+        let client = smtp::SmtpClient::new().smtp_utf8(true);
+        let transport = SmtpTransport::new(client, BufStream::new(tcp_stream)).await?;
+        let tcp_stream = transport.starttls().await?.into_inner();
+        let tls_stream = wrap_tls(strict_tls, hostname, tcp_stream)
+            .await
+            .context("STARTTLS upgrade failed")?;
+        let buffered_stream = BufStream::new(tls_stream);
+        let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
+        let client = smtp::SmtpClient::new().smtp_utf8(true).without_greeting();
+        let transport = SmtpTransport::new(client, session_stream).await?;
+        Ok(transport)
+    }
+
+    async fn connect_insecure(
+        &self,
+        context: &Context,
+        hostname: &str,
+        port: u16,
+    ) -> Result<SmtpTransport<Box<dyn SessionBufStream>>> {
+        let tcp_stream = connect_tcp(context, hostname, port, SMTP_TIMEOUT, false).await?;
+        let buffered_stream = BufStream::new(tcp_stream);
+        let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
+        let client = smtp::SmtpClient::new().smtp_utf8(true);
+        let transport = SmtpTransport::new(client, session_stream).await?;
+        Ok(transport)
+    }
+
     /// Connect using the provided login params.
     pub async fn connect(
         &mut self,
@@ -134,17 +257,48 @@ impl Smtp {
             | CertificateChecks::AcceptInvalidCertificates2 => false,
         };
 
-        let session_stream = connect::connect_stream(
-            context,
-            domain,
-            port,
-            strict_tls,
-            socks5_config.clone(),
-            lp.security,
-        )
-        .await?;
-        let client = smtp::SmtpClient::new().smtp_utf8(true).without_greeting();
-        let mut transport = SmtpTransport::new(client, session_stream).await?;
+        let mut transport = if let Some(socks5_config) = socks5_config {
+            match lp.security {
+                Socket::Automatic => bail!("SMTP port security is not configured"),
+                Socket::Ssl => {
+                    self.connect_secure_socks5(
+                        context,
+                        domain,
+                        port,
+                        strict_tls,
+                        socks5_config.clone(),
+                    )
+                    .await?
+                }
+                Socket::Starttls => {
+                    self.connect_starttls_socks5(
+                        context,
+                        domain,
+                        port,
+                        strict_tls,
+                        socks5_config.clone(),
+                    )
+                    .await?
+                }
+                Socket::Plain => {
+                    self.connect_insecure_socks5(context, domain, port, socks5_config.clone())
+                        .await?
+                }
+            }
+        } else {
+            match lp.security {
+                Socket::Automatic => bail!("SMTP port security is not configured"),
+                Socket::Ssl => {
+                    self.connect_secure(context, domain, port, strict_tls)
+                        .await?
+                }
+                Socket::Starttls => {
+                    self.connect_starttls(context, domain, port, strict_tls)
+                        .await?
+                }
+                Socket::Plain => self.connect_insecure(context, domain, port).await?,
+            }
+        };
 
         // Authenticate.
         {
@@ -207,10 +361,11 @@ pub(crate) async fn smtp_send(
     recipients: &[async_smtp::EmailAddress],
     message: &str,
     smtp: &mut Smtp,
-    msg_id: Option<MsgId>,
+    msg_id: MsgId,
 ) -> SendResult {
     if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
-        info!(context, "SMTP-sending out mime message:\n{message}");
+        info!(context, "smtp-sending out mime message:");
+        println!("{message}");
     }
 
     smtp.connectivity.set_working(context).await;
@@ -230,7 +385,7 @@ pub(crate) async fn smtp_send(
     let status = match send_result {
         Err(crate::smtp::send::Error::SmtpSend(err)) => {
             // Remote error, retry later.
-            info!(context, "SMTP failed to send: {:?}.", &err);
+            info!(context, "SMTP failed to send: {:?}", &err);
 
             let res = match err {
                 async_smtp::error::Error::Permanent(ref response) => {
@@ -257,10 +412,10 @@ pub(crate) async fn smtp_send(
                     };
 
                     if maybe_transient {
-                        info!(context, "Permanent error that is likely to actually be transient, postponing retry for later.");
+                        info!(context, "Permanent error that is likely to actually be transient, postponing retry for later");
                         SendResult::Retry
                     } else {
-                        info!(context, "Permanent error, message sending failed.");
+                        info!(context, "Permanent error, message sending failed");
                         // If we do not retry, add an info message to the chat.
                         // Yandex error "554 5.7.1 [2] Message rejected under suspicion of SPAM; https://ya.cc/..."
                         // should definitely go here, because user has to open the link to
@@ -281,19 +436,20 @@ pub(crate) async fn smtp_send(
                             // Any extended smtp status codes like x.1.1, x.1.2 or x.1.3 that we
                             // receive as a transient error are misconfigurations of the smtp server.
                             // See <https://tools.ietf.org/html/rfc3463#section-3.2>
-                            info!(context, "Received extended status code {first_word} for a transient error. This looks like a misconfigured SMTP server, let's fail immediately.");
+                            info!(context, "Received extended status code {} for a transient error. This looks like a misconfigured SMTP server, let's fail immediately", first_word);
                             SendResult::Failure(format_err!("Permanent SMTP error: {}", err))
                         } else {
                             info!(
                                 context,
-                                "Transient error with status code {first_word}, postponing retry for later."
+                                "Transient error with status code {}, postponing retry for later",
+                                first_word
                             );
                             SendResult::Retry
                         }
                     } else {
                         info!(
                             context,
-                            "Transient error without status code, postponing retry for later."
+                            "Transient error without status code, postponing retry for later"
                         );
                         SendResult::Retry
                     }
@@ -301,14 +457,14 @@ pub(crate) async fn smtp_send(
                 _ => {
                     info!(
                         context,
-                        "Message sending failed without error returned by the server, retry later."
+                        "Message sending failed without error returned by the server, retry later"
                     );
                     SendResult::Retry
                 }
             };
 
             // this clears last_success info
-            info!(context, "Failed to send message over SMTP, disconnecting.");
+            info!(context, "Failed to send message over SMTP, disconnecting");
             smtp.disconnect();
 
             res
@@ -316,42 +472,39 @@ pub(crate) async fn smtp_send(
         Err(crate::smtp::send::Error::Envelope(err)) => {
             // Local error, job is invalid, do not retry.
             smtp.disconnect();
-            warn!(context, "SMTP job is invalid: {err:#}.");
+            warn!(context, "SMTP job is invalid: {}", err);
             SendResult::Failure(err)
         }
         Err(crate::smtp::send::Error::NoTransport) => {
             // Should never happen.
             // It does not even make sense to disconnect here.
-            error!(context, "SMTP job failed because SMTP has no transport.");
+            error!(context, "SMTP job failed because SMTP has no transport");
             SendResult::Failure(format_err!("SMTP has not transport"))
         }
         Err(crate::smtp::send::Error::Other(err)) => {
             // Local error, job is invalid, do not retry.
             smtp.disconnect();
-            warn!(context, "Unable to load SMTP job: {err:#}.");
+            warn!(context, "unable to load job: {}", err);
             SendResult::Failure(err)
         }
         Ok(()) => SendResult::Success,
     };
 
     if let SendResult::Failure(err) = &status {
-        if let Some(msg_id) = msg_id {
-            // We couldn't send the message, so mark it as failed
-            match Message::load_from_db(context, msg_id).await {
-                Ok(mut msg) => {
-                    if let Err(err) =
-                        message::set_msg_failed(context, &mut msg, &err.to_string()).await
-                    {
-                        error!(context, "Failed to mark {msg_id} as failed: {err:#}.");
-                    }
-                }
-                Err(err) => {
-                    error!(
-                        context,
-                        "Failed to load {msg_id} to mark it as failed: {err:#}."
-                    );
+        // We couldn't send the message, so mark it as failed
+        match Message::load_from_db(context, msg_id).await {
+            Ok(mut msg) => {
+                if let Err(err) = message::set_msg_failed(context, &mut msg, &err.to_string()).await
+                {
+                    error!(context, "Failed to mark {msg_id} as failed: {err:#}.");
                 }
             }
+            Err(err) => {
+                error!(
+                    context,
+                    "Failed to load {msg_id} to mark it as failed: {err:#}."
+                );
+            }
         }
     }
     status
@@ -405,12 +558,12 @@ pub(crate) async fn send_msg_to_smtp(
             .sql
             .execute("DELETE FROM smtp WHERE id=?", (rowid,))
             .await
-            .context("Failed to remove message with exceeded retry limit from smtp table")?;
+            .context("failed to remove message with exceeded retry limit from smtp table")?;
         return Ok(());
     }
     info!(
         context,
-        "Try number {retries} to send message {msg_id} (entry {rowid}) over SMTP."
+        "Try number {retries} to send message {msg_id} (entry {rowid}) over SMTP"
     );
 
     let recipients_list = recipients
@@ -419,14 +572,14 @@ pub(crate) async fn send_msg_to_smtp(
             |addr| match async_smtp::EmailAddress::new(addr.to_string()) {
                 Ok(addr) => Some(addr),
                 Err(err) => {
-                    warn!(context, "Invalid recipient: {} {:?}.", addr, err);
+                    warn!(context, "invalid recipient: {} {:?}", addr, err);
                     None
                 }
             },
         )
         .collect::<Vec<_>>();
 
-    let status = smtp_send(context, &recipients_list, body.as_str(), smtp, Some(msg_id)).await;
+    let status = smtp_send(context, &recipients_list, body.as_str(), smtp, msg_id).await;
 
     match status {
         SendResult::Retry => {}
@@ -497,7 +650,7 @@ pub(crate) async fn send_msg_to_smtp(
 async fn send_mdns(context: &Context, connection: &mut Smtp) -> Result<()> {
     loop {
         if !context.ratelimit.read().await.can_send() {
-            info!(context, "Ratelimiter does not allow sending MDNs now.");
+            info!(context, "Ratelimiter does not allow sending MDNs now");
             return Ok(());
         }
 
@@ -510,6 +663,9 @@ async fn send_mdns(context: &Context, connection: &mut Smtp) -> Result<()> {
 }
 
 /// Tries to send all messages currently in `smtp`, `smtp_status_updates` and `smtp_mdns` tables.
+///
+/// Logs and ignores SMTP errors to ensure that a single SMTP message constantly failing to be sent
+/// does not block other messages in the queue from being sent.
 pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp) -> Result<()> {
     let ratelimited = if context.ratelimit.read().await.can_send() {
         // add status updates and sync messages to end of sending queue
@@ -541,7 +697,7 @@ pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp)
     for rowid in rowids {
         send_msg_to_smtp(context, connection, rowid)
             .await
-            .context("Failed to send message")?;
+            .context("failed to send message")?;
     }
 
     // although by slow sending, ratelimit may have been expired meanwhile,
@@ -550,12 +706,12 @@ pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp)
     if !ratelimited {
         send_mdns(context, connection)
             .await
-            .context("Failed to send MDNs")?;
+            .context("failed to send MDNs")?;
     }
     Ok(())
 }
 
-/// Tries to send MDN for message identified by `rfc724_mdn` to `contact_id`.
+/// Tries to send MDN for message `msg_id` to `contact_id`.
 ///
 /// Attempts to aggregate additional MDNs for `contact_id` into sent MDN.
 ///
@@ -564,9 +720,9 @@ pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp)
 /// points to non-existent message or contact.
 ///
 /// Returns true on success, false on temporary error.
-async fn send_mdn_rfc724_mid(
+async fn send_mdn_msg_id(
     context: &Context,
-    rfc724_mid: &str,
+    msg_id: MsgId,
     contact_id: ContactId,
     smtp: &mut Smtp,
 ) -> Result<bool> {
@@ -576,30 +732,26 @@ async fn send_mdn_rfc724_mid(
     }
 
     // Try to aggregate additional MDNs into this MDN.
-    let additional_rfc724_mids: Vec<String> = context
+    let (additional_msg_ids, additional_rfc724_mids): (Vec<MsgId>, Vec<String>) = context
         .sql
         .query_map(
-            "SELECT rfc724_mid
+            "SELECT msg_id, rfc724_mid
              FROM smtp_mdns
-             WHERE from_id=? AND rfc724_mid!=?",
-            (contact_id, &rfc724_mid),
+             WHERE from_id=? AND msg_id!=?",
+            (contact_id, msg_id),
             |row| {
-                let rfc724_mid: String = row.get(0)?;
-                Ok(rfc724_mid)
+                let msg_id: MsgId = row.get(0)?;
+                let rfc724_mid: String = row.get(1)?;
+                Ok((msg_id, rfc724_mid))
             },
             |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
         )
         .await?
         .into_iter()
-        .collect();
+        .unzip();
 
-    let mimefactory = MimeFactory::from_mdn(
-        context,
-        contact_id,
-        rfc724_mid.to_string(),
-        additional_rfc724_mids.clone(),
-    )
-    .await?;
+    let msg = Message::load_from_db(context, msg_id).await?;
+    let mimefactory = MimeFactory::from_mdn(context, &msg, additional_rfc724_mids).await?;
     let rendered_msg = mimefactory.render(context).await?;
     let body = rendered_msg.message;
 
@@ -608,21 +760,21 @@ async fn send_mdn_rfc724_mid(
         .map_err(|err| format_err!("invalid recipient: {} {:?}", addr, err))?;
     let recipients = vec![recipient];
 
-    match smtp_send(context, &recipients, &body, smtp, None).await {
+    match smtp_send(context, &recipients, &body, smtp, msg_id).await {
         SendResult::Success => {
-            info!(context, "Successfully sent MDN for {rfc724_mid}.");
+            info!(context, "Successfully sent MDN for {}", msg_id);
             context
                 .sql
-                .execute("DELETE FROM smtp_mdns WHERE rfc724_mid = ?", (rfc724_mid,))
+                .execute("DELETE FROM smtp_mdns WHERE msg_id = ?", (msg_id,))
                 .await?;
-            if !additional_rfc724_mids.is_empty() {
+            if !additional_msg_ids.is_empty() {
                 let q = format!(
-                    "DELETE FROM smtp_mdns WHERE rfc724_mid IN({})",
-                    sql::repeat_vars(additional_rfc724_mids.len())
+                    "DELETE FROM smtp_mdns WHERE msg_id IN({})",
+                    sql::repeat_vars(additional_msg_ids.len())
                 );
                 context
                     .sql
-                    .execute(&q, rusqlite::params_from_iter(additional_rfc724_mids))
+                    .execute(&q, rusqlite::params_from_iter(additional_msg_ids))
                     .await?;
             }
             Ok(true)
@@ -630,7 +782,7 @@ async fn send_mdn_rfc724_mid(
         SendResult::Retry => {
             info!(
                 context,
-                "Temporary SMTP failure while sending an MDN for {rfc724_mid}."
+                "Temporary SMTP failure while sending an MDN for {}", msg_id
             );
             Ok(false)
         }
@@ -646,7 +798,7 @@ async fn send_mdn(context: &Context, smtp: &mut Smtp) -> Result<bool> {
         context.sql.execute("DELETE FROM smtp_mdns", []).await?;
         return Ok(false);
     }
-    info!(context, "Sending MDNs.");
+    info!(context, "Sending MDNs");
 
     context
         .sql
@@ -655,40 +807,40 @@ async fn send_mdn(context: &Context, smtp: &mut Smtp) -> Result<bool> {
     let Some(msg_row) = context
         .sql
         .query_row_optional(
-            "SELECT rfc724_mid, from_id FROM smtp_mdns ORDER BY retries LIMIT 1",
+            "SELECT msg_id, from_id FROM smtp_mdns ORDER BY retries LIMIT 1",
             [],
             |row| {
-                let rfc724_mid: String = row.get(0)?;
+                let msg_id: MsgId = row.get(0)?;
                 let from_id: ContactId = row.get(1)?;
-                Ok((rfc724_mid, from_id))
+                Ok((msg_id, from_id))
             },
         )
         .await?
     else {
         return Ok(false);
     };
-    let (rfc724_mid, contact_id) = msg_row;
+    let (msg_id, contact_id) = msg_row;
 
     context
         .sql
         .execute(
-            "UPDATE smtp_mdns SET retries=retries+1 WHERE rfc724_mid=?",
-            (rfc724_mid.clone(),),
+            "UPDATE smtp_mdns SET retries=retries+1 WHERE msg_id=?",
+            (msg_id,),
         )
         .await
-        .context("Failed to update MDN retries count")?;
+        .context("failed to update MDN retries count")?;
 
-    match send_mdn_rfc724_mid(context, &rfc724_mid, contact_id, smtp).await {
+    match send_mdn_msg_id(context, msg_id, contact_id, smtp).await {
         Err(err) => {
             // If there is an error, for example there is no message corresponding to the msg_id in the
             // database, do not try to send this MDN again.
             warn!(
                 context,
-                "Error sending MDN for {rfc724_mid}, removing it: {err:#}."
+                "Error sending MDN for {msg_id}, removing it: {err:#}."
             );
             context
                 .sql
-                .execute("DELETE FROM smtp_mdns WHERE rfc724_mid = ?", (rfc724_mid,))
+                .execute("DELETE FROM smtp_mdns WHERE msg_id = ?", (msg_id,))
                 .await?;
             Err(err)
         }

src/smtp/connect.rs

@@ -1,194 +0,0 @@
-//! SMTP connection establishment.
-
-use std::net::SocketAddr;
-
-use anyhow::{bail, format_err, Context as _, Result};
-use async_smtp::{SmtpClient, SmtpTransport};
-use tokio::io::BufStream;
-
-use crate::context::Context;
-use crate::net::dns::{lookup_host_with_cache, update_connect_timestamp};
-use crate::net::session::SessionBufStream;
-use crate::net::tls::wrap_tls;
-use crate::net::{connect_tcp_inner, connect_tls_inner};
-use crate::provider::Socket;
-use crate::socks::Socks5Config;
-
-/// Returns TLS, STARTTLS or plaintext connection
-/// using SOCKS5 or direct connection depending on the given configuration.
-///
-/// Connection is returned after skipping the welcome message
-/// and is ready for sending commands. Because SMTP STARTTLS
-/// does not send welcome message over TLS connection
-/// after establishing it, welcome message is always ignored
-/// to unify the result regardless of whether TLS or STARTTLS is used.
-pub(crate) async fn connect_stream(
-    context: &Context,
-    host: &str,
-    port: u16,
-    strict_tls: bool,
-    socks5_config: Option<Socks5Config>,
-    security: Socket,
-) -> Result<Box<dyn SessionBufStream>> {
-    if let Some(socks5_config) = socks5_config {
-        let stream = match security {
-            Socket::Automatic => bail!("SMTP port security is not configured"),
-            Socket::Ssl => {
-                connect_secure_socks5(context, host, port, strict_tls, socks5_config.clone())
-                    .await?
-            }
-            Socket::Starttls => {
-                connect_starttls_socks5(context, host, port, strict_tls, socks5_config.clone())
-                    .await?
-            }
-            Socket::Plain => {
-                connect_insecure_socks5(context, host, port, socks5_config.clone()).await?
-            }
-        };
-        Ok(stream)
-    } else {
-        let mut first_error = None;
-        let load_cache = strict_tls && (security == Socket::Ssl || security == Socket::Starttls);
-
-        for resolved_addr in lookup_host_with_cache(context, host, port, load_cache).await? {
-            let res = match security {
-                Socket::Automatic => bail!("SMTP port security is not configured"),
-                Socket::Ssl => connect_secure(resolved_addr, host, strict_tls).await,
-                Socket::Starttls => connect_starttls(resolved_addr, host, strict_tls).await,
-                Socket::Plain => connect_insecure(resolved_addr).await,
-            };
-            match res {
-                Ok(stream) => {
-                    let ip_addr = resolved_addr.ip().to_string();
-                    if load_cache {
-                        update_connect_timestamp(context, host, &ip_addr).await?;
-                    }
-                    return Ok(stream);
-                }
-                Err(err) => {
-                    warn!(context, "Failed to connect to {resolved_addr}: {err:#}.");
-                    first_error.get_or_insert(err);
-                }
-            }
-        }
-        Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
-    }
-}
-
-/// Reads and ignores SMTP greeting.
-///
-/// This function is used to unify
-/// TLS, STARTTLS and plaintext connection setup
-/// by skipping the greeting in case of TLS
-/// and STARTTLS connection setup.
-async fn skip_smtp_greeting<R: tokio::io::AsyncBufReadExt + Unpin>(stream: &mut R) -> Result<()> {
-    let mut line = String::with_capacity(512);
-    loop {
-        let read = stream.read_line(&mut line).await?;
-        if read == 0 {
-            bail!("Unexpected EOF while reading SMTP greeting.");
-        }
-        if line.starts_with("220- ") {
-            continue;
-        } else if line.starts_with("220 ") {
-            return Ok(());
-        } else {
-            bail!("Unexpected greeting: {line:?}.");
-        }
-    }
-}
-
-async fn connect_secure_socks5(
-    context: &Context,
-    hostname: &str,
-    port: u16,
-    strict_tls: bool,
-    socks5_config: Socks5Config,
-) -> Result<Box<dyn SessionBufStream>> {
-    let socks5_stream = socks5_config
-        .connect(context, hostname, port, strict_tls)
-        .await?;
-    let tls_stream = wrap_tls(strict_tls, hostname, "smtp", socks5_stream).await?;
-    let mut buffered_stream = BufStream::new(tls_stream);
-    skip_smtp_greeting(&mut buffered_stream).await?;
-    let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
-    Ok(session_stream)
-}
-
-async fn connect_starttls_socks5(
-    context: &Context,
-    hostname: &str,
-    port: u16,
-    strict_tls: bool,
-    socks5_config: Socks5Config,
-) -> Result<Box<dyn SessionBufStream>> {
-    let socks5_stream = socks5_config
-        .connect(context, hostname, port, strict_tls)
-        .await?;
-
-    // Run STARTTLS command and convert the client back into a stream.
-    let client = SmtpClient::new().smtp_utf8(true);
-    let transport = SmtpTransport::new(client, BufStream::new(socks5_stream)).await?;
-    let tcp_stream = transport.starttls().await?.into_inner();
-    let tls_stream = wrap_tls(strict_tls, hostname, "smtp", tcp_stream)
-        .await
-        .context("STARTTLS upgrade failed")?;
-    let buffered_stream = BufStream::new(tls_stream);
-    let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
-    Ok(session_stream)
-}
-
-async fn connect_insecure_socks5(
-    context: &Context,
-    hostname: &str,
-    port: u16,
-    socks5_config: Socks5Config,
-) -> Result<Box<dyn SessionBufStream>> {
-    let socks5_stream = socks5_config
-        .connect(context, hostname, port, false)
-        .await?;
-    let mut buffered_stream = BufStream::new(socks5_stream);
-    skip_smtp_greeting(&mut buffered_stream).await?;
-    let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
-    Ok(session_stream)
-}
-
-async fn connect_secure(
-    addr: SocketAddr,
-    hostname: &str,
-    strict_tls: bool,
-) -> Result<Box<dyn SessionBufStream>> {
-    let tls_stream = connect_tls_inner(addr, hostname, strict_tls, "smtp").await?;
-    let mut buffered_stream = BufStream::new(tls_stream);
-    skip_smtp_greeting(&mut buffered_stream).await?;
-    let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
-    Ok(session_stream)
-}
-
-async fn connect_starttls(
-    addr: SocketAddr,
-    host: &str,
-    strict_tls: bool,
-) -> Result<Box<dyn SessionBufStream>> {
-    let tcp_stream = connect_tcp_inner(addr).await?;
-
-    // Run STARTTLS command and convert the client back into a stream.
-    let client = async_smtp::SmtpClient::new().smtp_utf8(true);
-    let transport = async_smtp::SmtpTransport::new(client, BufStream::new(tcp_stream)).await?;
-    let tcp_stream = transport.starttls().await?.into_inner();
-    let tls_stream = wrap_tls(strict_tls, host, "smtp", tcp_stream)
-        .await
-        .context("STARTTLS upgrade failed")?;
-
-    let buffered_stream = BufStream::new(tls_stream);
-    let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
-    Ok(session_stream)
-}
-
-async fn connect_insecure(addr: SocketAddr) -> Result<Box<dyn SessionBufStream>> {
-    let tcp_stream = connect_tcp_inner(addr).await?;
-    let mut buffered_stream = BufStream::new(tcp_stream);
-    skip_smtp_greeting(&mut buffered_stream).await?;
-    let session_stream: Box<dyn SessionBufStream> = Box::new(buffered_stream);
-    Ok(session_stream)
-}

src/socks.rs

@@ -2,6 +2,7 @@
 
 use std::fmt;
 use std::pin::Pin;
+use std::time::Duration;
 
 use anyhow::Result;
 use fast_socks5::client::{Config, Socks5Stream};
@@ -75,9 +76,11 @@ impl Socks5Config {
         context: &Context,
         target_host: &str,
         target_port: u16,
+        timeout_val: Duration,
         load_dns_cache: bool,
     ) -> Result<Socks5Stream<Pin<Box<TimeoutStream<TcpStream>>>>> {
-        let tcp_stream = connect_tcp(context, &self.host, self.port, load_dns_cache).await?;
+        let tcp_stream =
+            connect_tcp(context, &self.host, self.port, timeout_val, load_dns_cache).await?;
 
         let authentication_method = if let Some((username, password)) = self.user_password.as_ref()
         {

src/sql.rs

@@ -126,7 +126,7 @@ impl Sql {
     }
 
     /// Closes all underlying Sqlite connections.
-    pub(crate) async fn close(&self) {
+    async fn close(&self) {
         let _ = self.pool.write().await.take();
         // drop closes the connection
     }
@@ -137,50 +137,46 @@ impl Sql {
             .to_str()
             .with_context(|| format!("path {path:?} is not valid unicode"))?
             .to_string();
+        let res = self
+            .call_write(move |conn| {
+                // Check that backup passphrase is correct before resetting our database.
+                conn.execute("ATTACH DATABASE ? AS backup KEY ?", (path_str, passphrase))
+                    .context("failed to attach backup database")?;
+                if let Err(err) = conn
+                    .query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
+                    .context("backup passphrase is not correct")
+                {
+                    conn.execute("DETACH DATABASE backup", [])
+                        .context("failed to detach backup database")?;
+                    return Err(err);
+                }
 
-        // Keep `config_cache` locked all the time the db is imported so that nobody can use invalid
-        // values from there. And clear it immediately so as not to forget in case of errors.
-        let mut config_cache = self.config_cache.write().await;
-        config_cache.clear();
-
-        self.call_write(move |conn| {
-            // Check that backup passphrase is correct before resetting our database.
-            conn.execute("ATTACH DATABASE ? AS backup KEY ?", (path_str, passphrase))
-                .context("failed to attach backup database")?;
-            let res = conn
-                .query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
-                .context("backup passphrase is not correct");
-
-            // Reset the database without reopening it. We don't want to reopen the database because we
-            // don't have main database passphrase at this point.
-            // See <https://sqlite.org/c3ref/c_dbconfig_enable_fkey.html> for documentation.
-            // Without resetting import may fail due to existing tables.
-            let res = res.and_then(|_| {
+                // Reset the database without reopening it. We don't want to reopen the database because we
+                // don't have main database passphrase at this point.
+                // See <https://sqlite.org/c3ref/c_dbconfig_enable_fkey.html> for documentation.
+                // Without resetting import may fail due to existing tables.
                 conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, true)
-                    .context("failed to set SQLITE_DBCONFIG_RESET_DATABASE")
-            });
-            let res = res.and_then(|_| {
+                    .context("failed to set SQLITE_DBCONFIG_RESET_DATABASE")?;
                 conn.execute("VACUUM", [])
-                    .context("failed to vacuum the database")
-            });
-            let res = res.and(
+                    .context("failed to vacuum the database")?;
                 conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, false)
-                    .context("failed to unset SQLITE_DBCONFIG_RESET_DATABASE"),
-            );
-            let res = res.and_then(|_| {
-                conn.query_row("SELECT sqlcipher_export('main', 'backup')", [], |_row| {
-                    Ok(())
-                })
-                .context("failed to import from attached backup database")
-            });
-            let res = res.and(
+                    .context("failed to unset SQLITE_DBCONFIG_RESET_DATABASE")?;
+                let res = conn
+                    .query_row("SELECT sqlcipher_export('main', 'backup')", [], |_row| {
+                        Ok(())
+                    })
+                    .context("failed to import from attached backup database");
                 conn.execute("DETACH DATABASE backup", [])
-                    .context("failed to detach backup database"),
-            );
-            res?;
-            Ok(())
-        })
-        .await
+                    .context("failed to detach backup database")?;
+                res?;
+                Ok(())
+            })
+            .await;
+
+        // The config cache is wrong now that we have a different database
+        self.config_cache.write().await.clear();
+
+        res
     }
 
     /// Creates a new connection pool.
@@ -354,12 +350,12 @@ impl Sql {
     ///
     /// 1. As mentioned above, SQLite's locking mechanism is non-async and sleeps in a loop.
     /// 2. If there are other write transactions, we block the db connection until
-    ///    upgraded. If some reader comes then, it has to get the next, less used connection with a
-    ///    worse per-connection page cache (SQLite allows one write and any number of reads in parallel).
+    ///   upgraded. If some reader comes then, it has to get the next, less used connection with a
+    ///   worse per-connection page cache (SQLite allows one write and any number of reads in parallel).
     /// 3. If a transaction is blocked for more than `busy_timeout`, it fails with SQLITE_BUSY.
     /// 4. If upon a successful upgrade to a write transaction the db has been modified,
-    ///    the transaction has to be rolled back and retried, which means extra work in terms of
-    ///    CPU/battery.
+    ///   the transaction has to be rolled back and retried, which means extra work in terms of
+    ///   CPU/battery.
     ///
     /// The only pro of making write transactions DEFERRED w/o the external locking would be some
     /// parallelism between them.
@@ -766,9 +762,8 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
     context
         .sql
         .execute(
-            "DELETE FROM msgs_mdns WHERE msg_id NOT IN \
-            (SELECT id FROM msgs WHERE chat_id!=?)",
-            (DC_CHAT_ID_TRASH,),
+            "DELETE FROM msgs_mdns WHERE msg_id NOT IN (SELECT id FROM msgs)",
+            (),
         )
         .await
         .context("failed to remove old MDNs")
@@ -778,9 +773,8 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
     context
         .sql
         .execute(
-            "DELETE FROM msgs_status_updates WHERE msg_id NOT IN \
-            (SELECT id FROM msgs WHERE chat_id!=?)",
-            (DC_CHAT_ID_TRASH,),
+            "DELETE FROM msgs_status_updates WHERE msg_id NOT IN (SELECT id FROM msgs)",
+            (),
         )
         .await
         .context("failed to remove old webxdc status updates")
@@ -996,19 +990,16 @@ async fn maybe_add_from_param(
     Ok(())
 }
 
-/// Removes from the database stale locally deleted messages that also don't
+/// Removes from the database locally deleted messages that also don't
 /// have a server UID.
 async fn prune_tombstones(sql: &Sql) -> Result<()> {
-    // Keep tombstones for the last two days to prevent redownloading locally deleted messages.
-    let timestamp_max = time().saturating_sub(2 * 24 * 3600);
     sql.execute(
         "DELETE FROM msgs
          WHERE chat_id=?
-         AND timestamp<=?
          AND NOT EXISTS (
          SELECT * FROM imap WHERE msgs.rfc724_mid=rfc724_mid AND target!=''
          )",
-        (DC_CHAT_ID_TRASH, timestamp_max),
+        (DC_CHAT_ID_TRASH,),
     )
     .await?;
     Ok(())

src/sql/migrations.rs

@@ -1,6 +1,6 @@
 //! Migrations module.
 
-use anyhow::{ensure, Context as _, Result};
+use anyhow::{Context as _, Result};
 use deltachat_contact_tools::EmailAddress;
 use rusqlite::OptionalExtension;
 
@@ -11,7 +11,6 @@ use crate::imap;
 use crate::message::MsgId;
 use crate::provider::get_provider_by_domain;
 use crate::sql::Sql;
-use crate::tools::inc_and_check;
 
 const DBVERSION: i32 = 68;
 const VERSION_CFG: &str = "dbversion";
@@ -579,7 +578,7 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
     if dbversion < 90 {
         sql.execute_migration(
             r#"CREATE TABLE smtp_mdns (
-              msg_id INTEGER NOT NULL, -- id of the message in msgs table which requested MDN (DEPRECATED 2024-06-21)
+              msg_id INTEGER NOT NULL, -- id of the message in msgs table which requested MDN
               from_id INTEGER NOT NULL, -- id of the contact that sent the message, MDN destination
               rfc724_mid TEXT NOT NULL, -- Message-ID header
               retries INTEGER NOT NULL DEFAULT 0 -- Number of failed attempts to send MDN
@@ -938,23 +937,6 @@ CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid);
             .await?;
     }
 
-    if dbversion < 115 {
-        sql.execute_migration("ALTER TABLE msgs ADD COLUMN txt_normalized TEXT", 115)
-            .await?;
-    }
-    let mut migration_version: i32 = 115;
-
-    inc_and_check(&mut migration_version, 116)?;
-    if dbversion < migration_version {
-        // Whether the message part doesn't need to be stored on the server. If all parts are marked
-        // deleted, a server-side deletion is issued.
-        sql.execute_migration(
-            "ALTER TABLE msgs ADD COLUMN deleted INTEGER NOT NULL DEFAULT 0",
-            migration_version,
-        )
-        .await?;
-    }
-
     let new_version = sql
         .get_raw_config_int(VERSION_CFG)
         .await?
@@ -963,11 +945,13 @@ CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid);
         let created_db = if exists_before_update {
             ""
         } else {
-            "Created new database. "
+            "Created new database; "
         };
-        info!(context, "{}Migration done from v{}.", created_db, dbversion);
+        info!(
+            context,
+            "{}[migration] v{}-v{}", created_db, dbversion, new_version
+        );
     }
-    info!(context, "Database version: v{new_version}.");
 
     Ok((
         recalc_fingerprints,
@@ -1000,13 +984,6 @@ impl Sql {
 
     async fn execute_migration(&self, query: &str, version: i32) -> Result<()> {
         self.transaction(move |transaction| {
-            let curr_version: String = transaction.query_row(
-                "SELECT IFNULL(value, ?) FROM config WHERE keyname=?;",
-                ("0", VERSION_CFG),
-                |row| row.get(0),
-            )?;
-            let curr_version: i32 = curr_version.parse()?;
-            ensure!(curr_version < version, "Db version must be increased");
             Self::set_db_version_trans(transaction, version)?;
             transaction.execute_batch(query)?;
 

src/stock_str.rs

@@ -80,6 +80,12 @@ pub enum StockMessage {
     #[strum(props(fallback = "Fingerprints"))]
     FingerPrints = 30,
 
+    #[strum(props(fallback = "Return receipt"))]
+    ReadRcpt = 31,
+
+    #[strum(props(fallback = "This is a return receipt for the message \"%1$s\"."))]
+    ReadRcptMailBody = 32,
+
     #[strum(props(fallback = "End-to-end encryption preferred"))]
     E2ePreferred = 34,
 
@@ -437,6 +443,9 @@ pub enum StockMessage {
         fallback = "Could not yet establish guaranteed end-to-end encryption, but you may already send a message."
     ))]
     SecurejoinWaitTimeout = 191,
+
+    #[strum(props(fallback = "Contact"))]
+    Contact = 200,
 }
 
 impl StockMessage {
@@ -764,6 +773,11 @@ pub(crate) async fn gif(context: &Context) -> String {
     translated(context, StockMessage::Gif).await
 }
 
+/// Stock string: `Encrypted message`.
+pub(crate) async fn encrypted_msg(context: &Context) -> String {
+    translated(context, StockMessage::EncryptedMsg).await
+}
+
 /// Stock string: `End-to-end encryption available.`.
 pub(crate) async fn e2e_available(context: &Context) -> String {
     translated(context, StockMessage::E2eAvailable).await
@@ -789,6 +803,18 @@ pub(crate) async fn finger_prints(context: &Context) -> String {
     translated(context, StockMessage::FingerPrints).await
 }
 
+/// Stock string: `Return receipt`.
+pub(crate) async fn read_rcpt(context: &Context) -> String {
+    translated(context, StockMessage::ReadRcpt).await
+}
+
+/// Stock string: `This is a return receipt for the message "%1$s".`.
+pub(crate) async fn read_rcpt_mail_body(context: &Context, message: &str) -> String {
+    translated(context, StockMessage::ReadRcptMailBody)
+        .await
+        .replace1(message)
+}
+
 /// Stock string: `Group image deleted.`.
 pub(crate) async fn msg_grp_img_deleted(context: &Context, by_contact: ContactId) -> String {
     if by_contact == ContactId::SELF {
@@ -843,10 +869,10 @@ pub(crate) async fn setup_contact_qr_description(
     display_name: &str,
     addr: &str,
 ) -> String {
-    let name = if display_name.is_empty() {
+    let name = if display_name == addr {
         addr.to_owned()
     } else {
-        display_name.to_owned()
+        format!("{display_name} ({addr})")
     };
     translated(context, StockMessage::SetupContactQRDescription)
         .await
@@ -1075,6 +1101,11 @@ pub(crate) async fn videochat_invite_msg_body(context: &Context, url: &str) -> S
         .replace1(url)
 }
 
+/// Stock string: `Contact`.
+pub(crate) async fn contact(context: &Context) -> String {
+    translated(context, StockMessage::Contact).await
+}
+
 /// Stock string: `Error:\n\n“%1$s”`.
 pub(crate) async fn configuration_failed(context: &Context, details: &str) -> String {
     translated(context, StockMessage::ConfigurationFailed)

src/summary.rs

@@ -10,7 +10,6 @@ use crate::contact::{Contact, ContactId};
 use crate::context::Context;
 use crate::message::{Message, MessageState, Viewtype};
 use crate::mimeparser::SystemMessage;
-use crate::param::Param;
 use crate::stock_str;
 use crate::stock_str::msg_reacted;
 use crate::tools::truncate;
@@ -129,8 +128,6 @@ impl Summary {
         {
             msg.get_file(context)
                 .and_then(|path| path.to_str().map(|p| p.to_owned()))
-        } else if msg.viewtype == Viewtype::Webxdc {
-            Some("webxdc-icon://last-msg-id".to_string())
         } else {
             None
         };
@@ -152,7 +149,7 @@ impl Summary {
 
 impl Message {
     /// Returns a summary text.
-    pub(crate) async fn get_summary_text(&self, context: &Context) -> String {
+    async fn get_summary_text(&self, context: &Context) -> String {
         let summary = self.get_summary_text_without_prefix(context).await;
 
         if self.is_forwarded() {
@@ -234,8 +231,8 @@ impl Message {
             }
             Viewtype::Vcard => {
                 emoji = Some("👤");
-                type_name = None;
-                type_file = self.param.get(Param::Summary1).map(|s| s.to_string());
+                type_name = Some(stock_str::contact(context).await);
+                type_file = None;
                 append_text = true;
             }
             Viewtype::Text | Viewtype::Unknown => {
@@ -287,7 +284,6 @@ impl Message {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::chat::ChatId;
     use crate::param::Param;
     use crate::test_utils as test;
 
@@ -300,9 +296,7 @@ mod tests {
     async fn test_get_summary_text() {
         let d = test::TestContext::new().await;
         let ctx = &d.ctx;
-        let chat_id = ChatId::create_for_contact(ctx, ContactId::SELF)
-            .await
-            .unwrap();
+
         let some_text = " bla \t\n\tbla\n\t".to_string();
 
         let mut msg = Message::new(Viewtype::Text);
@@ -358,18 +352,6 @@ mod tests {
         msg.set_file("foo.mp3", None);
         assert_summary_texts(&msg, ctx, "🎵 foo.mp3 \u{2013} bla bla").await; // file name and text added for audio
 
-        let mut msg = Message::new(Viewtype::File);
-        let bytes = include_bytes!("../test-data/webxdc/with-minimal-manifest.xdc");
-        msg.set_file_from_bytes(ctx, "foo.xdc", bytes, None)
-            .await
-            .unwrap();
-        chat_id.set_draft(ctx, Some(&mut msg)).await.unwrap();
-        assert_eq!(msg.viewtype, Viewtype::Webxdc);
-        assert_summary_texts(&msg, ctx, "nice app!").await;
-        msg.set_text(some_text.clone());
-        chat_id.set_draft(ctx, Some(&mut msg)).await.unwrap();
-        assert_summary_texts(&msg, ctx, "nice app! \u{2013} bla bla").await;
-
         let mut msg = Message::new(Viewtype::File);
         msg.set_file("foo.bar", None);
         assert_summary_texts(&msg, ctx, "📎 foo.bar").await; // file name is added for files
@@ -385,34 +367,25 @@ mod tests {
         assert_summary_texts(&msg, ctx, "Video chat invitation").await; // text is not added for videochat invitations
 
         let mut msg = Message::new(Viewtype::Vcard);
-        msg.set_file_from_bytes(ctx, "foo.vcf", b"", None)
-            .await
-            .unwrap();
-        chat_id.set_draft(ctx, Some(&mut msg)).await.unwrap();
-        // If a vCard can't be parsed, the message becomes `Viewtype::File`.
-        assert_eq!(msg.viewtype, Viewtype::File);
-        assert_summary_texts(&msg, ctx, "📎 foo.vcf").await;
+        msg.set_file("foo.vcf", None);
+        assert_summary_texts(&msg, ctx, "👤 Contact").await;
         msg.set_text(some_text.clone());
-        assert_summary_texts(&msg, ctx, "📎 foo.vcf \u{2013} bla bla").await;
+        assert_summary_texts(&msg, ctx, "👤 bla bla").await;
 
-        for vt in [Viewtype::Vcard, Viewtype::File] {
-            let mut msg = Message::new(vt);
-            msg.set_file_from_bytes(
-                ctx,
-                "alice.vcf",
-                b"BEGIN:VCARD\n\
-                  VERSION:4.0\n\
-                  FN:Alice Wonderland\n\
-                  EMAIL;TYPE=work:alice@example.org\n\
-                  END:VCARD",
-                None,
-            )
-            .await
-            .unwrap();
-            chat_id.set_draft(ctx, Some(&mut msg)).await.unwrap();
-            assert_eq!(msg.viewtype, Viewtype::Vcard);
-            assert_summary_texts(&msg, ctx, "👤 Alice Wonderland").await;
-        }
+        let mut msg = Message::new(Viewtype::Vcard);
+        msg.set_file_from_bytes(
+            ctx,
+            "alice.vcf",
+            b"BEGIN:VCARD\n\
+              VERSION:4.0\n\
+              FN:Alice Wonderland\n\
+              EMAIL;TYPE=work:alice@example.org\n\
+              END:VCARD",
+            None,
+        )
+        .await
+        .unwrap();
+        assert_summary_texts(&msg, ctx, "👤 Contact").await;
 
         // Forwarded
         let mut msg = Message::new(Viewtype::Text);

src/sync.rs

@@ -101,7 +101,7 @@ impl Context {
     /// Adds item and timestamp to the list of items that should be synchronized to other devices.
     /// If device synchronization is disabled, the function does nothing.
     async fn add_sync_item_with_timestamp(&self, data: SyncData, timestamp: i64) -> Result<()> {
-        if !self.should_send_sync_msgs().await? {
+        if !self.get_config_bool(Config::SyncMsgs).await? {
             return Ok(());
         }
 
@@ -120,9 +120,8 @@ impl Context {
     /// Adds most recent qr-code tokens for a given chat to the list of items to be synced.
     /// If device synchronization is disabled,
     /// no tokens exist or the chat is unpromoted, the function does nothing.
-    /// The caller should perform `SchedulerState::interrupt_smtp()` on its own to trigger sending.
     pub(crate) async fn sync_qr_code_tokens(&self, chat_id: Option<ChatId>) -> Result<()> {
-        if !self.should_send_sync_msgs().await? {
+        if !self.get_config_bool(Config::SyncMsgs).await? {
             return Ok(());
         }
 
@@ -155,7 +154,6 @@ impl Context {
 
     /// Adds deleted qr-code token to the list of items to be synced
     /// so that the token also gets deleted on the other devices.
-    /// This interrupts SMTP on its own.
     pub(crate) async fn sync_qr_code_token_deletion(
         &self,
         invitenumber: String,
@@ -166,16 +164,10 @@ impl Context {
             auth,
             grpid: None,
         }))
-        .await?;
-        self.scheduler.interrupt_smtp().await;
-        Ok(())
+        .await
     }
 
     /// Sends out a self-sent message with items to be synchronized, if any.
-    ///
-    /// Mustn't be called from multiple tasks in parallel to avoid sending the same sync items twice
-    /// because sync items are removed from the db only after successful sending. We guarantee this
-    /// by calling `send_sync_msg()` only from the SMTP loop.
     pub async fn send_sync_msg(&self) -> Result<Option<MsgId>> {
         if let Some((json, ids)) = self.build_sync_json().await? {
             let chat_id =
@@ -330,30 +322,17 @@ mod tests {
     use super::*;
     use crate::chatlist::Chatlist;
     use crate::contact::{Contact, Origin};
-    use crate::test_utils::{TestContext, TestContextManager};
+    use crate::test_utils::TestContext;
     use crate::tools::SystemTime;
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_config_sync_msgs() -> Result<()> {
         let t = TestContext::new_alice().await;
-        assert_eq!(t.get_config_bool(Config::SyncMsgs).await?, false);
-        assert_eq!(t.get_config_bool(Config::BccSelf).await?, true);
-        assert_eq!(t.should_send_sync_msgs().await?, false);
-
+        assert!(!t.get_config_bool(Config::SyncMsgs).await?);
         t.set_config_bool(Config::SyncMsgs, true).await?;
-        assert_eq!(t.get_config_bool(Config::SyncMsgs).await?, true);
-        assert_eq!(t.get_config_bool(Config::BccSelf).await?, true);
-        assert_eq!(t.should_send_sync_msgs().await?, true);
-
-        t.set_config_bool(Config::BccSelf, false).await?;
-        assert_eq!(t.get_config_bool(Config::SyncMsgs).await?, true);
-        assert_eq!(t.get_config_bool(Config::BccSelf).await?, false);
-        assert_eq!(t.should_send_sync_msgs().await?, false);
-
+        assert!(t.get_config_bool(Config::SyncMsgs).await?);
         t.set_config_bool(Config::SyncMsgs, false).await?;
-        assert_eq!(t.get_config_bool(Config::SyncMsgs).await?, false);
-        assert_eq!(t.get_config_bool(Config::BccSelf).await?, false);
-        assert_eq!(t.should_send_sync_msgs().await?, false);
+        assert!(!t.get_config_bool(Config::SyncMsgs).await?);
         Ok(())
     }
 
@@ -603,31 +582,4 @@ mod tests {
 
         Ok(())
     }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_bot_no_sync_msgs() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-        alice.set_config_bool(Config::SyncMsgs, true).await?;
-        let chat_id = alice.create_chat(bob).await.id;
-
-        chat::send_text_msg(alice, chat_id, "hi".to_string()).await?;
-        alice
-            .set_config(Config::Displayname, Some("Alice Human"))
-            .await?;
-        alice.send_sync_msg().await?;
-        alice.pop_sent_msg().await;
-        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
-        assert_eq!(msg.text, "hi");
-
-        alice.set_config_bool(Config::Bot, true).await?;
-        chat::send_text_msg(alice, chat_id, "hi".to_string()).await?;
-        alice
-            .set_config(Config::Displayname, Some("Alice Bot"))
-            .await?;
-        let msg = bob.recv_msg(&alice.pop_sent_msg().await).await;
-        assert_eq!(msg.text, "hi");
-        Ok(())
-    }
 }

src/test_utils.rs

@@ -566,12 +566,18 @@ impl TestContext {
 
     /// Returns the [`Contact`] for the other [`TestContext`], creating it if necessary.
     pub async fn add_or_lookup_contact(&self, other: &TestContext) -> Contact {
+        let name = other
+            .ctx
+            .get_config(Config::Displayname)
+            .await
+            .unwrap_or_default()
+            .unwrap_or_default();
         let primary_self_addr = other.ctx.get_primary_self_addr().await.unwrap();
         let addr = ContactAddress::new(&primary_self_addr).unwrap();
         // MailinglistAddress is the lowest allowed origin, we'd prefer to not modify the
         // origin when creating this contact.
         let (contact_id, modified) =
-            Contact::add_or_lookup(self, "", &addr, Origin::MailinglistAddress)
+            Contact::add_or_lookup(self, &name, &addr, Origin::MailinglistAddress)
                 .await
                 .expect("add_or_lookup");
         match modified {
@@ -1104,7 +1110,6 @@ pub(crate) async fn mark_as_verified(this: &TestContext, other: &TestContext) {
 /// Pops a sync message from alice0 and receives it on alice1. Should be used after an action on
 /// alice0's side that implies sending a sync message.
 pub(crate) async fn sync(alice0: &TestContext, alice1: &TestContext) {
-    alice0.send_sync_msg().await.unwrap();
     let sync_msg = alice0.pop_sent_msg().await;
     let no_msg = alice1.recv_msg_opt(&sync_msg).await;
     assert!(no_msg.is_none());