chore: update mail-builder to 1.0

test: test sending and receiving long filename with emojis
mail-builder changed how such filename is encoded in Content-Disposition between versions 0.5.0 and 1.0.0. We can parse both encodings already and the test was not failing, but it is worth adding this corner case to the tests. mail-builder 0.5.0 encoded the filename like this: Content-Disposition: attachment; filename="=?utf-8?Q?very_long_filename_with_emoji_=F0=9F=98=80_very_long_file_name_with_emoji_=F0=9F=AB=A0_very_long_file_name_with_emoji.tar.gz?=" mail-builder 1.0.0 encodes the filename like this: Content-Disposition: attachment; filename*0*=UTF-8''very%20long%20filename%20with%20emoji%20%F0%9F%98%80%20; filename*1*=very%20long%20file%20name%20with%20emoji%20%F0%9F%AB%A0%20very; filename*2*=%20long%20file%20name%20with%20emoji.tar.gz
2026-10-08 06:00:17 +03:00 · 2026-10-02 22:10:55 +00:00 · 2026-10-02 22:10:55 +00:00
24 changed files with 206 additions and 271 deletions
@@ -20,7 +20,7 @@ permissions: {}

 env:
  RUSTFLAGS: -Dwarnings
-  RUST_VERSION: 1.99.0
+  RUST_VERSION: 1.98.1

  # Minimum Supported Rust Version
  MSRV: 1.89.0
@@ -30,9 +30,6 @@ jobs:
    name: Lint Rust
    runs-on: ubuntu-latest
    timeout-minutes: 60
-    env:
-      # Tests always unwind: match it so dependencies are only checked once.
-      CARGO_PROFILE_DEV_PANIC: unwind
    steps:
      - uses: actions/checkout@v7
        with:
@@ -51,6 +48,8 @@ jobs:
        run: cargo fmt --all -- --check
      - name: Run clippy
        run: scripts/clippy.sh
+      - name: Check with all features
+        run: cargo check --workspace --all-targets --all-features
      - name: Check with only default features
        run: cargo check --all-targets

@@ -140,12 +139,12 @@ jobs:
      - name: Tests
        env:
          RUST_BACKTRACE: 1
-        run: cargo nextest run --workspace --exclude deltachat-jsonrpc-bindings --locked
+        run: cargo nextest run --workspace --locked

      - name: Doc-Tests
        env:
          RUST_BACKTRACE: 1
-        run: cargo test --workspace --exclude deltachat-jsonrpc-bindings --locked --doc
+        run: cargo test --workspace --locked --doc

      - name: Test cargo vendor
        run: cargo vendor
@@ -194,9 +194,9 @@ dependencies = [

 [[package]]
 name = "astral-tokio-tar"
-version = "0.7.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2e989b33246fe9240d39accf4dd9a01e0b6c1f3ce9dd095e0a47fa02505523"
+checksum = "b18457efd137254e016bbde5e1d88df61c4e1a5ae2223746e56123bac6af2463"
 dependencies = [
 "futures-core",
 "libc",
@@ -205,7 +205,6 @@ dependencies = [
 "rustix 1.1.4",
 "tokio",
 "tokio-stream",
- "zerocopy 0.8.59",
 ]

 [[package]]
@@ -1406,6 +1405,7 @@ dependencies = [
 "tokio-stream",
 "tokio-util",
 "toml",
+ "tracing",
 "url",
 "uuid",
 "walkdir",
@@ -3444,9 +3444,9 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd"

 [[package]]
 name = "mail-builder"
-version = "0.5.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c942e8a4b83f9351236c1e531ea9fa0237913d63c7fc36818430e0128a1ddf3"
+checksum = "ccbc27cb02a58a311a404769a22f5abf63fe3173b290d80be7c534f9c7023151"

 [[package]]
 name = "mailparse"
@@ -4246,9 +4246,9 @@ dependencies = [

 [[package]]
 name = "pgp"
-version = "0.21.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae70f4d9325a391db30d115d6191a7bb67cec856aa0bba131290f0c4e09a532a"
+checksum = "1cfa4743b28656065ff4c0ba09e46b357a65e8c00fc2341e89084b82f87cbdf1"
 dependencies = [
 "aead",
 "aes",
@@ -4595,7 +4595,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy 0.7.35",
+ "zerocopy",
 ]

 [[package]]
@@ -5812,7 +5812,7 @@ dependencies = [
 "sha3",
 "signature",
 "typenum",
- "zerocopy 0.7.35",
+ "zerocopy",
 ]

 [[package]]
@@ -7582,16 +7582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
 "byteorder",
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df92bf3d9227be3d53173901ddbffac2babc27ae50f397776ffd6dc33f800cb"
-dependencies = [
- "zerocopy-derive 0.8.59",
+ "zerocopy-derive",
 ]

 [[package]]
@@ -7605,17 +7596,6 @@ dependencies = [
 "syn 2.0.118",
 ]

-[[package]]
-name = "zerocopy-derive"
-version = "0.8.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac4f328cf2f05d084e496c3e9c3f33ed0a183656a16e1fcec4d464d8373aec82"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.118",
-]
-
 [[package]]
 name = "zerofrom"
 version = "0.1.5"
@@ -69,7 +69,7 @@ iroh-gossip = { version = "0.35", default-features = false, features = ["net"] }
 iroh = { version = "0.35", default-features = false }
 kamadak-exif = "0.6.1"
 libc = { workspace = true }
-mail-builder = { version = "0.5.0", default-features = false }
+mail-builder = { version = "1.0.0", default-features = false }
 mailparse = { workspace = true }
 mime = "0.3.17"
 num_cpus = "1.17"
@@ -77,7 +77,7 @@ num-derive = "0.4"
 num-traits = { workspace = true }
 parking_lot = "0.12.4"
 percent-encoding = "2.3"
-pgp = { version = "0.21.0", features = ["pqc"], default-features = false }
+pgp = { version = "0.20.0", features = ["draft-pqc"], default-features = false }
 pin-project = "1"
 qrcodegen = "1.7.0"
 quick-xml = { version = "0.41", features = ["escape-html"] }
@@ -100,10 +100,11 @@ thiserror = { workspace = true }
 tokio-io-timeout = "1.2.1"
 tokio-rustls = { version = "0.26.2", default-features = false, features = ["tls12", "brotli"] }
 tokio-stream = { version = "0.1.17", features = ["fs"] }
-astral-tokio-tar = { version = "0.7.0", default-features = false }
+astral-tokio-tar = { version = "0.6.3", default-features = false }
 tokio-util = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
 toml = "0.9"
+tracing = "0.1.41"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 walkdir = "2.5.0"
@@ -3543,6 +3543,28 @@ uint32_t         dc_chatlist_get_msg_id      (const dc_chatlist_t* chatlist, siz
 dc_lot_t*        dc_chatlist_get_summary     (const dc_chatlist_t* chatlist, size_t index, dc_chat_t* chat);


+/**
+ * Create a chatlist summary item when the chatlist object is already unref()'d.
+ *
+ * This function is similar to dc_chatlist_get_summary(), however,
+ * it takes the chat ID and the message ID as returned by dc_chatlist_get_chat_id() and dc_chatlist_get_msg_id()
+ * as arguments. The chatlist object itself is not needed directly.
+ *
+ * This maybe useful if you convert the complete object into a different representation
+ * as done e.g. in the node-bindings.
+ * If you have access to the chatlist object in some way, using this function is not recommended,
+ * use dc_chatlist_get_summary() in this case instead.
+ *
+ * @memberof dc_context_t
+ * @param context The context object.
+ * @param chat_id The chat ID to get a summary for.
+ * @param msg_id The message ID to get a summary for.
+ * @return The summary as an dc_lot_t object, see dc_chatlist_get_summary() for details.
+ *     Must be freed using dc_lot_unref(). NULL is never returned.
+ */
+dc_lot_t*        dc_chatlist_get_summary2    (dc_context_t* context, uint32_t chat_id, uint32_t msg_id);
+
+
 /**
 * Get info summary for a chat, in JSON format.
 *
@@ -47,6 +47,7 @@ mod dc_array;
 mod lot;

 mod string;
+use deltachat::chatlist::Chatlist;

 use self::string::*;

@@ -2843,6 +2844,34 @@ pub unsafe extern "C" fn dc_chatlist_get_summary(
    Box::into_raw(Box::new(summary.into()))
 }

+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn dc_chatlist_get_summary2(
+    context: *mut dc_context_t,
+    chat_id: u32,
+    msg_id: u32,
+) -> *mut dc_lot_t {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_chatlist_get_summary2()");
+        return ptr::null_mut();
+    }
+    let ctx = unsafe { &*context };
+    let msg_id = if msg_id == 0 {
+        None
+    } else {
+        Some(MsgId::new(msg_id))
+    };
+    let summary = block_on(Chatlist::get_summary2(
+        ctx,
+        ChatId::new(chat_id),
+        msg_id,
+        None,
+    ))
+    .context("get_summary2 failed")
+    .log_err(ctx)
+    .unwrap_or_default();
+    Box::into_raw(Box::new(summary.into()))
+}
+
 // dc_chat_t

 /// FFI struct for [dc_chat_t]
@@ -31,6 +31,8 @@ pub enum ChatListItemFetchResult {
        summary_text1: String,
        summary_text2: String,
        summary_status: u32,
+        /// showing preview if last chat message is image
+        summary_preview_image: Option<String>,

        /// True if the chat is encrypted.
        /// This means that all messages in the chat are encrypted,
@@ -101,6 +103,8 @@ pub(crate) async fn get_chat_list_item_by_id(
    let summary_text1 = summary.prefix.map_or_else(String::new, |s| s.to_string());
    let summary_text2 = summary.text.to_owned();

+    let summary_preview_image = summary.thumbnail_path;
+
    let visibility = chat.get_visibility();

    let avatar_path = chat
@@ -153,6 +157,7 @@ pub(crate) async fn get_chat_list_item_by_id(
        summary_text1,
        summary_text2,
        summary_status: summary.state.to_u32().expect("impossible"), // idea and a function to transform the constant to strings? or return string enum
+        summary_preview_image,
        is_encrypted: chat.is_encrypted(ctx).await?,
        is_group: chat.get_type() == Chattype::Group,
        fresh_message_counter,
@@ -149,10 +149,7 @@ class Rpc:
    def close(self) -> None:
        """Terminate RPC server process and wait until the reader loop finishes."""
        self.closing = True
-        # JSON-RPC error may happen if RPC server process has crashed already.
-        # We still want to shutdown all threads in this case.
-        with contextlib.suppress(JsonRpcError):
-            self.stop_io_for_all_accounts()
+        self.stop_io_for_all_accounts()
        # Let `events_loop` stop cleanly on `closing` before the pipe goes away,
        # otherwise it might exit through an "RPC server closed" error instead.
        self.events_thread.join()
@@ -35,19 +35,6 @@ def test_sleep(rpc) -> None:
        assert sleep_5_future in pending


-def test_shutdown(rpc) -> None:
-    """Test RPC client shutdown if RPC server process is terminated.
-
-    This is a regression test, at the time of adding it RPC client
-    did not terminate all threads and python process did not exit.
-    Shutting down all threads is tested implicitly by pytest-timeout.
-    """
-    rpc.process.kill()
-    rpc.process.wait()
-    with pytest.raises(JsonRpcError):
-        rpc.get_system_info()
-
-
 def test_email_address_validity(rpc) -> None:
    valid_addresses = [
        "email@example.com",
@@ -113,8 +113,6 @@ skip = [
     { name = "windows_x86_64_gnu" },
     { name = "windows_x86_64_gnullvm" },
     { name = "windows_x86_64_msvc" },
-     { name = "zerocopy-derive", version = "0.7.35" },
-     { name = "zerocopy", version = "0.7.35" },
 ]


@@ -456,21 +456,6 @@ CREATE TABLE smtp_status_updates (
    descr TEXT NOT NULL -- text to send along with the updates
 );

-- Table to record the successful usage transports for sending.
-- Sorting the table by rowid in descending order
-- returns most recently successfully used transport first.
-CREATE TABLE smtp_success (
-    -- Sequentially increasing ID of the success.
-    -- Transport with the highest ID is to be used first.
-    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-
-    -- ID of the transport that was used to send a message.
-    transport_id INTEGER UNIQUE NOT NULL,
-
-    -- Delete `smtp_success` rows when the transport is deleted.
-    FOREIGN KEY(transport_id) REFERENCES transports(id) ON DELETE CASCADE
-) STRICT;
-
 -- Table of "sync items" to be grouped into sync messages
 -- and sent to own devices.
 CREATE TABLE multi_device_sync (
@@ -6,4 +6,4 @@
 #
 # To automatically fix warnings, run
 #   scripts/clippy.sh --fix --allow-dirty
-cargo clippy --locked --workspace --exclude deltachat-jsonrpc-bindings --all-targets --all-features "$@" -- -D warnings
+cargo clippy --locked --workspace --all-targets --all-features "$@" -- -D warnings
@@ -76,8 +76,12 @@ impl Accounts {
        Accounts::open(events, dir, writable).await
    }

-    fn log_info(&self, file: &str, line: u32, msg: String) {
-        self.emit_event(EventType::Info(format!("{file}:{line}: {msg}")));
+    /// Get the ID used to log events.
+    ///
+    /// Account manager logs events with ID 0
+    /// which is not used by any accounts.
+    fn get_id(&self) -> u32 {
+        0
    }

    /// Ensures the accounts directory and config file exist.
@@ -391,6 +395,11 @@ impl Accounts {
                "Starting background fetch for {n_accounts} accounts."
            )),
        });
+        ::tracing::event!(
+            ::tracing::Level::INFO,
+            account_id = 0,
+            "Starting background fetch for {n_accounts} accounts."
+        );
        let mut set = JoinSet::new();
        for account in accounts {
            set.spawn(async move {
@@ -406,6 +415,11 @@ impl Accounts {
                "Finished background fetch for {n_accounts} accounts."
            )),
        });
+        ::tracing::event!(
+            ::tracing::Level::INFO,
+            account_id = 0,
+            "Finished background fetch for {n_accounts} accounts."
+        );
    }

    /// Auxiliary function for [Accounts::background_fetch].
@@ -448,6 +462,11 @@ impl Accounts {
                id: 0,
                typ: EventType::Warning("Background fetch timed out.".to_string()),
            });
+            ::tracing::event!(
+                ::tracing::Level::WARN,
+                account_id = 0,
+                "Background fetch timed out."
+            );
        }
        events.emit(Event {
            id: 0,
@@ -530,7 +549,7 @@ impl Accounts {
        }
    }

-    /// Emits a single event with ID 0, which is not used by any accounts.
+    /// Emits a single event.
    pub fn emit_event(&self, event: EventType) {
        self.events.emit(Event { id: 0, typ: event })
    }
@@ -3,7 +3,6 @@
 use std::cmp;
 use std::collections::{BTreeSet, HashMap};
 use std::fmt;
-use std::io::Cursor;
 use std::marker::Sync;
 use std::path::{Path, PathBuf};
 use std::time::Duration;
@@ -1918,8 +1917,7 @@ impl Chat {
        let new_mime_headers: Option<String> = new_mime_headers.map(|s| {
            let html_part = MimePart::new("text/html", s);
            let mut buffer = Vec::new();
-            let cursor = Cursor::new(&mut buffer);
-            html_part.write_part(cursor).ok();
+            html_part.write_part(&mut buffer);
            String::from_utf8_lossy(&buffer).to_string()
        });
        let new_mime_headers = new_mime_headers.or_else(|| match was_truncated {
@@ -3,7 +3,6 @@
 #![allow(missing_docs)]

 use crate::context::Context;
-use crate::events::EventType;

 mod stream;

@@ -13,9 +12,15 @@ macro_rules! info {
    ($ctx:expr,  $msg:expr) => {
        info!($ctx, $msg,)
    };
-    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
-        $ctx.log_info(file!(), line!(), format!($msg, $($args),*))
-    };
+    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{
+        let formatted = format!($msg, $($args),*);
+        let full = format!("{file}:{line}: {msg}",
+                           file = file!(),
+                           line = line!(),
+                           msg = &formatted);
+        ::tracing::event!(::tracing::Level::INFO, account_id = $ctx.get_id(), "{}", &formatted);
+        $ctx.emit_event($crate::EventType::Info(full));
+    }};
 }

 // Workaround for <https://github.com/rust-lang/rust/issues/133708>.
@@ -25,9 +30,15 @@ mod warn_macro_mod {
        ($ctx:expr, $msg:expr) => {
            warn_macro!($ctx, $msg,)
        };
-        ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
-            $ctx.log_warn(file!(), line!(), format!($msg, $($args),*))
-        };
+        ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{
+            let formatted = format!($msg, $($args),*);
+            let full = format!("{file}:{line}: {msg}",
+                               file = file!(),
+                               line = line!(),
+                               msg = &formatted);
+            ::tracing::event!(::tracing::Level::WARN, account_id = $ctx.get_id(), "{}", &formatted);
+            $ctx.emit_event($crate::EventType::Warning(full));
+        }};
    }

    pub(crate) use warn_macro;
@@ -39,25 +50,15 @@ macro_rules! error {
    ($ctx:expr, $msg:expr) => {
        error!($ctx, $msg,)
    };
-    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
-        $ctx.log_error(format!($msg, $($args),*))
-    };
+    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{
+        let formatted = format!($msg, $($args),*);
+        ::tracing::event!(::tracing::Level::ERROR, account_id = $ctx.get_id(), "{}", &formatted);
+        $ctx.set_last_error(&formatted);
+        $ctx.emit_event($crate::EventType::Error(formatted));
+    }};
 }

 impl Context {
-    pub(crate) fn log_info(&self, file: &str, line: u32, msg: String) {
-        self.emit_event(EventType::Info(format!("{file}:{line}: {msg}")));
-    }
-
-    pub(crate) fn log_warn(&self, file: &str, line: u32, msg: String) {
-        self.emit_event(EventType::Warning(format!("{file}:{line}: {msg}")));
-    }
-
-    pub(crate) fn log_error(&self, msg: String) {
-        self.set_last_error(&msg);
-        self.emit_event(EventType::Error(msg));
-    }
-
    /// Set last error string.
    /// Implemented as blocking as used from macros in different, not always async blocks.
    pub fn set_last_error(&self, error: &str) {
@@ -115,6 +116,12 @@ impl<T, E: std::fmt::Display> LogExt<T, E> for Result<T, E> {
            );
            // We can't use the warn!() macro here as the file!() and line!() macros
            // don't work with #[track_caller]
+            tracing::event!(
+                ::tracing::Level::WARN,
+                account_id = context.get_id(),
+                "{}",
+                &full
+            );
            context.emit_event(crate::EventType::Warning(full));
        };
        self
@@ -93,6 +93,11 @@ impl<S: SessionStream> AsyncRead for LoggingStream<S> {
                "Read error on stream {peer_addr:?} after reading {} and writing {} bytes: {err}.",
                this.metrics.total_read, this.metrics.total_written
            );
+            tracing::event!(
+                ::tracing::Level::WARN,
+                account_id = *this.account_id,
+                log_message
+            );
            this.events.emit(Event {
                id: *this.account_id,
                typ: EventType::Warning(log_message),
@@ -1,7 +1,6 @@
 //! # MIME message production.

 use std::collections::{BTreeSet, HashSet};
-use std::io::Cursor;

 use anyhow::{Context as _, Result, bail, format_err};
 use base64::Engine as _;
@@ -245,25 +244,20 @@ pub(crate) fn render_queued_mail(

    let is_encrypted = encryption.is_encrypted();

-    fn add_header(
-        name: &[u8],
-        value: &impl mail_builder::headers::Header,
-        headers: &mut Vec<u8>,
-    ) -> Result<()> {
+    fn add_header(name: &[u8], value: &impl mail_builder::headers::Header, headers: &mut Vec<u8>) {
        headers.extend(name);
-        value.write_header(headers, name.len())?;
-        Ok(())
+        value.write_header(headers, name.len());
    }

    let from_header = new_address_with_name(&display_name, from_addr.clone());
-    add_header(b"From: ", &from_header, &mut inner_headers)?;
+    add_header(b"From: ", &from_header, &mut inner_headers);

    if is_encrypted {
        let unencrypted_from = Address::new_address(None::<&'static str>, from_addr.clone());
-        add_header(b"From: ", &unencrypted_from, &mut outer_headers)?;
-        add_header(b"HP-Outer: From: ", &unencrypted_from, &mut inner_headers)?;
+        add_header(b"From: ", &unencrypted_from, &mut outer_headers);
+        add_header(b"HP-Outer: From: ", &unencrypted_from, &mut inner_headers);
    } else {
-        add_header(b"From: ", &from_header, &mut outer_headers)?;
+        add_header(b"From: ", &from_header, &mut outer_headers);
    }

    if is_encrypted {
@@ -334,7 +328,7 @@ pub(crate) fn render_queued_mail(
            } else {
                &mut outer_headers
            },
-        )?;
+        );
    }

    if is_encrypted {
@@ -2433,8 +2427,7 @@ pub(crate) async fn keyupdate_message(
 /// Renders MIME part into a vector of bytes.
 pub(crate) fn part_to_bytes(message: MimePart<'static>) -> Vec<u8> {
    let mut raw_message = Vec::new();
-    let cursor = Cursor::new(&mut raw_message);
-    message.write_part(cursor).ok();
+    message.write_part(&mut raw_message);
    raw_message
 }

@@ -5,7 +5,7 @@ use pgp::armor;
 use pgp::packet::{Packet, PacketParser};
 use pretty_assertions::assert_eq;
 use regex::regex;
-use std::io::BufReader;
+use std::io::{BufReader, Cursor};
 use std::str;
 use std::time::Duration;

@@ -30,8 +30,7 @@ fn render_email_address(display_name: &str, addr: &str) -> String {
    let mut output = Vec::<u8>::new();
    new_address_with_name(display_name, addr.to_string())
        .unwrap_address()
-        .write_header(&mut output, 0)
-        .unwrap();
+        .write_header(&mut output, 0);

    String::from_utf8(output).unwrap()
 }
@@ -50,9 +49,7 @@ fn test_render_email_address() {

    let s = render_email_address(display_name, addr);

-    println!("{s}");
-
-    assert_eq!(s, "=?utf-8?B?w6Qgc3BhY2U=?= <x@y.org>");
+    assert_eq!(s, "=?utf-8?B?w6Qgc3BhY2U=?= <x@y.org>\r\n");
 }

 #[test]
@@ -70,14 +67,14 @@ fn test_render_email_address_noescape() {
    let s = render_email_address(display_name, addr);

    // Addresses should not be unnecessarily be encoded, see <https://github.com/deltachat/deltachat-core-rust/issues/1575>:
-    assert_eq!(s, r#""a space" <x@y.org>"#);
+    assert_eq!(s, "\"a space\" <x@y.org>\r\n");
 }

 #[test]
 fn test_render_email_address_duplicated_as_name() {
    let addr = "x@y.org";
    let s = render_email_address(addr, addr);
-    assert_eq!(s, "<x@y.org>");
+    assert_eq!(s, "<x@y.org>\r\n");
 }

 #[test]
@@ -102,8 +99,7 @@ fn render_header_text(text: &str) -> String {
    // Some non-zero length of the header name.
    let bytes_written = 20;
    mail_builder::headers::text::Text::new(text.to_string())
-        .write_header(&mut output, bytes_written)
-        .unwrap();
+        .write_header(&mut output, bytes_written);

    String::from_utf8(output).unwrap()
 }
@@ -955,7 +951,7 @@ async fn test_no_empty_to_header() -> Result<()> {
    assert!(
        // It would be equally fine if the payload contained `To: alice@example.org` or similar,
        // as long as it's a valid header
-        payload.contains("To: \"hidden-recipients\": ;"),
+        payload.contains("To: \"hidden-recipients\":;"),
        "Payload doesn't contain correct To: header: {payload}"
    );

@@ -1064,8 +1060,8 @@ MIME-Version: 1.0
 To: "hidden-recipients": ;
 Subject: [...]
 Chat-Version: 1.0
-Content-Type: multipart/encrypted; protocol="application/pgp-encrypted"; 
-	boundary="BOUNDARY"
+Content-Type: multipart/encrypted; protocol="application/pgp-encrypted";
+ boundary="BOUNDARY"


 --BOUNDARY
@@ -1106,17 +1102,18 @@ async fn test_render_unencrypted_msg_basic() -> Result<()> {
    let expected = r#"From: <alice@example.org>
 Message-ID: <MESSAGE_ID@localhost>
 MIME-Version: 1.0
-Autocrypt: addr=alice@example.org; prefer-encrypt=mutual; keydata=mDMEXlh13RYJKwYBBAHaRw8BAQdAzfVIAleCXMJrq8VeLlEVof6ITCviMktKjmcBKAu4m5
-	 DCtAQfFggAZgUCXlh13RYhBC5vossjtTLXKGNLWGSwj2Gp7ZRDAhsDAh4JBAsJCAcFFQgJCgsDFgIB
-	 AycJAgIZASwUgAAAAAASABFyZWxheXNAY2hhdG1haWwuYXRhbGljZUBleGFtcGxlLm9yZwAAb1QA/0
-	 HbvPN3/Vn02Gk1dcQMEcyGyETld9dSsRo8uwHAyW35AQCrFJjAQFLTud7XK61uYt9BC/QHipCfIGbq
-	 X1FjMbTUC80TPGFsaWNlQGV4YW1wbGUub3JnPsKRBBMWCAA5BQJeWHXdFiEELm+iyyO1MtcoY0tYZL
-	 CPYantlEMCGwMCHgkECwkIBwUVCAkKCwMWAgEDJwkCAhkBAAoJEGSwj2Gp7ZRD1m4A/iOifEzIOiP8
-	 wW0O8I/sg69gQtG8Czn4MsVV6Ea1EyIqAP4uByHaUJdy8MSQPfv/Usr09KsidNgy2Jh37yg82fKUBr
-	 g4BF5Ydd0SCisGAQQBl1UBBQEBB0AG7cjWy2SFAU8KnltlubVW67rFiyfp01JrRe6Xqy22HQMBCAeI
-	 eAQYFggAIBYhBC5vossjtTLXKGNLWGSwj2Gp7ZRDBQJeWHXdAhsMAAoJEGSwj2Gp7ZRDLo8BAObE8G
-	 nsGVwKzNqCvHeWgJsqhjS3C6gvSlV3tEm9XmF6AQDXucIyVfoBwoyMh2h6cSn/ATn5QJb35pgo+ivp
-	 3jsMAg==
+Autocrypt: addr=alice@example.org; prefer-encrypt=mutual;
+ keydata=mDMEXlh13RYJKwYBBAHaRw8BAQdAzfVIAleCXMJrq8VeLlEVof6ITCviMktKjmcBKAu4m5
+ DCtAQfFggAZgUCXlh13RYhBC5vossjtTLXKGNLWGSwj2Gp7ZRDAhsDAh4JBAsJCAcFFQgJCgsDFgIB
+ AycJAgIZASwUgAAAAAASABFyZWxheXNAY2hhdG1haWwuYXRhbGljZUBleGFtcGxlLm9yZwAAb1QA/0
+ HbvPN3/Vn02Gk1dcQMEcyGyETld9dSsRo8uwHAyW35AQCrFJjAQFLTud7XK61uYt9BC/QHipCfIGbq
+ X1FjMbTUC80TPGFsaWNlQGV4YW1wbGUub3JnPsKRBBMWCAA5BQJeWHXdFiEELm+iyyO1MtcoY0tYZL
+ CPYantlEMCGwMCHgkECwkIBwUVCAkKCwMWAgEDJwkCAhkBAAoJEGSwj2Gp7ZRD1m4A/iOifEzIOiP8
+ wW0O8I/sg69gQtG8Czn4MsVV6Ea1EyIqAP4uByHaUJdy8MSQPfv/Usr09KsidNgy2Jh37yg82fKUBr
+ g4BF5Ydd0SCisGAQQBl1UBBQEBB0AG7cjWy2SFAU8KnltlubVW67rFiyfp01JrRe6Xqy22HQMBCAeI
+ eAQYFggAIBYhBC5vossjtTLXKGNLWGSwj2Gp7ZRDBQJeWHXdAhsMAAoJEGSwj2Gp7ZRDLo8BAObE8G
+ nsGVwKzNqCvHeWgJsqhjS3C6gvSlV3tEm9XmF6AQDXucIyVfoBwoyMh2h6cSn/ATn5QJb35pgo+ivp
+ 3jsMAg==
 Content-Type: text/plain; charset="utf-8"
 Date: DATE
 To: <bob@example.net>
@@ -1126,7 +1123,7 @@ Chat-Version: 1.0
 Content-Transfer-Encoding: 7bit

 Hello!"#
-    .replace("\n", "\r\n");
+        .replace("\n", "\r\n");
    assert_eq!(
        unencrypted, expected,
        "---------------- Actual: ----------------
@@ -1156,19 +1153,20 @@ async fn test_render_unencrypted_msg_with_attachment() -> Result<()> {
    let expected = r#"From: <alice@example.org>
 Message-ID: <MESSAGE_ID@localhost>
 MIME-Version: 1.0
-Autocrypt: addr=alice@example.org; prefer-encrypt=mutual; keydata=mDMEXlh13RYJKwYBBAHaRw8BAQdAzfVIAleCXMJrq8VeLlEVof6ITCviMktKjmcBKAu4m5
-	 DCtAQfFggAZgUCXlh13RYhBC5vossjtTLXKGNLWGSwj2Gp7ZRDAhsDAh4JBAsJCAcFFQgJCgsDFgIB
-	 AycJAgIZASwUgAAAAAASABFyZWxheXNAY2hhdG1haWwuYXRhbGljZUBleGFtcGxlLm9yZwAAb1QA/0
-	 HbvPN3/Vn02Gk1dcQMEcyGyETld9dSsRo8uwHAyW35AQCrFJjAQFLTud7XK61uYt9BC/QHipCfIGbq
-	 X1FjMbTUC80TPGFsaWNlQGV4YW1wbGUub3JnPsKRBBMWCAA5BQJeWHXdFiEELm+iyyO1MtcoY0tYZL
-	 CPYantlEMCGwMCHgkECwkIBwUVCAkKCwMWAgEDJwkCAhkBAAoJEGSwj2Gp7ZRD1m4A/iOifEzIOiP8
-	 wW0O8I/sg69gQtG8Czn4MsVV6Ea1EyIqAP4uByHaUJdy8MSQPfv/Usr09KsidNgy2Jh37yg82fKUBr
-	 g4BF5Ydd0SCisGAQQBl1UBBQEBB0AG7cjWy2SFAU8KnltlubVW67rFiyfp01JrRe6Xqy22HQMBCAeI
-	 eAQYFggAIBYhBC5vossjtTLXKGNLWGSwj2Gp7ZRDBQJeWHXdAhsMAAoJEGSwj2Gp7ZRDLo8BAObE8G
-	 nsGVwKzNqCvHeWgJsqhjS3C6gvSlV3tEm9XmF6AQDXucIyVfoBwoyMh2h6cSn/ATn5QJb35pgo+ivp
-	 3jsMAg==
-Content-Type: multipart/mixed; 
-	boundary="BOUNDARY"
+Autocrypt: addr=alice@example.org; prefer-encrypt=mutual;
+ keydata=mDMEXlh13RYJKwYBBAHaRw8BAQdAzfVIAleCXMJrq8VeLlEVof6ITCviMktKjmcBKAu4m5
+ DCtAQfFggAZgUCXlh13RYhBC5vossjtTLXKGNLWGSwj2Gp7ZRDAhsDAh4JBAsJCAcFFQgJCgsDFgIB
+ AycJAgIZASwUgAAAAAASABFyZWxheXNAY2hhdG1haWwuYXRhbGljZUBleGFtcGxlLm9yZwAAb1QA/0
+ HbvPN3/Vn02Gk1dcQMEcyGyETld9dSsRo8uwHAyW35AQCrFJjAQFLTud7XK61uYt9BC/QHipCfIGbq
+ X1FjMbTUC80TPGFsaWNlQGV4YW1wbGUub3JnPsKRBBMWCAA5BQJeWHXdFiEELm+iyyO1MtcoY0tYZL
+ CPYantlEMCGwMCHgkECwkIBwUVCAkKCwMWAgEDJwkCAhkBAAoJEGSwj2Gp7ZRD1m4A/iOifEzIOiP8
+ wW0O8I/sg69gQtG8Czn4MsVV6Ea1EyIqAP4uByHaUJdy8MSQPfv/Usr09KsidNgy2Jh37yg82fKUBr
+ g4BF5Ydd0SCisGAQQBl1UBBQEBB0AG7cjWy2SFAU8KnltlubVW67rFiyfp01JrRe6Xqy22HQMBCAeI
+ eAQYFggAIBYhBC5vossjtTLXKGNLWGSwj2Gp7ZRDBQJeWHXdAhsMAAoJEGSwj2Gp7ZRDLo8BAObE8G
+ nsGVwKzNqCvHeWgJsqhjS3C6gvSlV3tEm9XmF6AQDXucIyVfoBwoyMh2h6cSn/ATn5QJb35pgo+ivp
+ 3jsMAg==
+Content-Type: multipart/mixed;
+ boundary="BOUNDARY"
 Date: DATE
 To: <bob@example.net>
 Subject: Message from alice@example.org
@@ -1032,6 +1032,7 @@ Content-Disposition: reaction\n\
        assert_eq!(summary.timestamp, bob_msg1.get_timestamp()); // time refers to message, not to reaction
        assert_eq!(summary.state, MessageState::InFresh); // state refers to message, not to reaction
        assert!(summary.prefix.is_none());
+        assert!(summary.thumbnail_path.is_none());
        assert_summary(&alice, "BOB reacted 👍 to \"Party?\"").await;

        // Alice reacts to own message as well
@@ -2957,6 +2957,7 @@ async fn test_weird_and_duplicated_filenames() -> Result<()> {
        "a.tar.gz",
        "a.a..a.a.a.a.tar.gz",
        "a. tar.tar.gz",
+        "very long filename with emoji \u{1F600} very long file name with emoji \u{1FAE0} very long file name with emoji.tar.gz",
    ] {
        let attachment = alice.blobdir.join(filename_sent);
        let content = "File content of tar.gz archive".to_string();
@@ -54,39 +54,6 @@ pub(crate) struct Smtp {
    pub(crate) last_send_error: Option<String>,
 }

-/// Returns transports with their IDs in the order in which they should be tried.
-async fn sorted_transports(context: &Context) -> Result<Vec<(u32, ConfiguredLoginParam)>> {
-    context
-        .sql
-        .query_map_vec(
-            "SELECT transports.id, configured_param FROM transports
-             LEFT JOIN smtp_success ON smtp_success.transport_id=transports.id
-             ORDER BY IFNULL(smtp_success.id, 0) DESC, transports.id ASC",
-            (),
-            |row| {
-                let id: u32 = row.get(0)?;
-                let json: String = row.get(1)?;
-                let param = ConfiguredLoginParam::from_json(&json)?;
-                Ok((id, param))
-            },
-        )
-        .await
-}
-
-/// Records successful use of SMTP transport so it is tried first next time we connect to SMTP.
-async fn record_success(context: &Context, transport_id: u32) -> Result<()> {
-    // INSERT OR REPLACE essentially replaces rowid of the row
-    // if the row exists already, so it becomes the highest rowid in the table.
-    context
-        .sql
-        .execute(
-            "INSERT OR REPLACE INTO smtp_success (transport_id) VALUES (?)",
-            (transport_id,),
-        )
-        .await?;
-    Ok(())
-}
-
 impl Smtp {
    /// Create a new Smtp instances.
    pub fn new() -> Self {
@@ -101,8 +68,6 @@ impl Smtp {
            // separate task to avoid waiting for reply or timeout.
            task::spawn(async move { transport.quit().await });
        }
-        self.transport_id = None;
-        self.from = None;
        self.last_success = None;
    }

@@ -134,7 +99,13 @@ impl Smtp {

        self.connectivity.set_connecting(context);
        let proxy_config = ProxyConfig::load(context).await?;
-        for (transport_id, lp) in sorted_transports(context).await? {
+        let transports = ConfiguredLoginParam::load_all(context).await?;
+
+        // Try to connect to the newest transport first. If sending is unreliable,
+        // user can configure a new transport and it will be the one used.
+        // Conversely, if user just added a new transport and sending got less reliable,
+        // user can restore old state by removing the just added transport.
+        for (transport_id, lp) in transports.into_iter().rev() {
            info!(context, "Trying to connect to transport {transport_id}.");
            match self
                .connect(
@@ -354,18 +325,6 @@ pub(crate) async fn smtp_send(
        Ok(()) => SendResult::Success,
    };

-    if matches!(status, SendResult::Success) {
-        debug_assert!(smtp.transport_id.is_some());
-        if let Some(transport_id) = smtp.transport_id
-            && let Err(err) = record_success(context, transport_id).await
-        {
-            warn!(
-                context,
-                "Failed to record successful use of transport {transport_id} in smtp_success table: {err:#}."
-            );
-        }
-    }
-
    if let SendResult::Failure(err) = &status
        && let Some(msg_id) = msg_id
    {
@@ -897,6 +856,3 @@ pub(crate) async fn add_self_recipients(

    Ok(())
 }
-
-#[cfg(test)]
-mod smtp_tests;
@@ -1,49 +0,0 @@
-use anyhow::Result;
-
-use crate::test_utils::TestContextManager;
-use crate::transport;
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_smtp_candidates() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let t = &tcm.unconfigured().await;
-
-    transport::add_pseudo_transport(t, "foo@example.net").await?;
-    transport::add_pseudo_transport(t, "bar@example.net").await?;
-    transport::add_pseudo_transport(t, "baz@example.net").await?;
-
-    let transports = super::sorted_transports(t).await?;
-    let [
-        (transport_id1, ref transport1),
-        (transport_id2, ref transport2),
-        (transport_id3, ref transport3),
-    ] = transports[..]
-    else {
-        panic!("Unexpected number of transports");
-    };
-
-    // By default first added transport is used first.
-    assert_eq!(transport1.addr, "foo@example.net");
-    assert_eq!(transport2.addr, "bar@example.net");
-    assert_eq!(transport3.addr, "baz@example.net");
-
-    super::record_success(t, transport_id3).await?;
-    let transports2 = super::sorted_transports(t).await?;
-    assert_eq!(transports2[0].0, transport_id3);
-    assert_eq!(transports2[1].0, transport_id1);
-    assert_eq!(transports2[2].0, transport_id2);
-
-    super::record_success(t, transport_id2).await?;
-    let transports3 = super::sorted_transports(t).await?;
-    assert_eq!(transports3[0].0, transport_id2);
-    assert_eq!(transports3[1].0, transport_id3);
-    assert_eq!(transports3[2].0, transport_id1);
-
-    super::record_success(t, transport_id3).await?;
-    let transports4 = super::sorted_transports(t).await?;
-    assert_eq!(transports4[0].0, transport_id3);
-    assert_eq!(transports4[1].0, transport_id2);
-    assert_eq!(transports4[2].0, transport_id1);
-
-    Ok(())
-}
@@ -2672,21 +2672,6 @@ CREATE TABLE smtp2 (
            .await?;
    }

-    inc_and_check(&mut migration_version, 168)?;
-    if dbversion < migration_version {
-        sql.execute_migration(
-            "
-CREATE TABLE smtp_success (
-    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-    transport_id INTEGER UNIQUE NOT NULL,
-    FOREIGN KEY(transport_id) REFERENCES transports(id) ON DELETE CASCADE
-) STRICT;
-",
-            migration_version,
-        )
-        .await?;
-    }
-
    let new_version = sql
        .get_raw_config_int(VERSION_CFG)
        .await?
@@ -56,6 +56,9 @@ pub struct Summary {

    /// Message state.
    pub state: MessageState,
+
+    /// Message preview image path
+    pub thumbnail_path: Option<String>,
 }

 impl Summary {
@@ -80,6 +83,7 @@ impl Summary {
                text: msg_reacted(context, reaction_contact_id, &reaction, &summary).await,
                timestamp: msg.get_timestamp(), // message timestamp (not reaction) to make timestamps more consistent with chats ordering
                state: msg.state, // message state (not reaction) - indicating if it was me sending the last message
+                thumbnail_path: None,
            });
        }
        Self::new(context, msg, chat, contact).await
@@ -123,11 +127,24 @@ impl Summary {
            text = stock_str::reply_noun(context)
        }

+        let thumbnail_path = if msg.viewtype == Viewtype::Image
+            || msg.viewtype == Viewtype::Gif
+            || msg.viewtype == Viewtype::Sticker
+        {
+            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
+        };
+
        Ok(Summary {
            prefix,
            text,
            timestamp: msg.get_timestamp(),
            state: msg.state,
+            thumbnail_path,
        })
    }

@@ -1664,6 +1664,7 @@ async fn test_webxdc_chatlist_summary() -> Result<()> {
    assert_eq!(chatlist.len(), 1);
    let summary = chatlist.get_summary(&t, 0, None).await?;
    assert_eq!(summary.text, "📱 nice app!".to_string());
+    assert_eq!(summary.thumbnail_path.unwrap(), "webxdc-icon://last-msg-id");

    Ok(())
 }