From 8a9e60afc309a85aac8adbcf8c7dbeda34ac1997 Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Thu, 20 Mar 2025 19:56:12 +0100
Subject: [PATCH] feat: Nicer configuration error (#6684)

---
 src/configure.rs | 5 ++++-
 src/imap.rs      | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/configure.rs b/src/configure.rs
index 004833826..3a94db315 100644
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -485,7 +485,10 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Configure
     let configuring = true;
     let mut imap_session = match imap.connect(ctx, configuring).await {
         Ok(session) => session,
-        Err(err) => bail!("{}", nicer_configuration_error(ctx, err.to_string()).await),
+        Err(err) => bail!(
+            "{}",
+            nicer_configuration_error(ctx, format!("{err:#}")).await
+        ),
     };
 
     progress!(ctx, 850);
diff --git a/src/imap.rs b/src/imap.rs
index fd6ef61b2..d2aed151c 100644
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -348,10 +348,11 @@ impl Imap {
                 connection_candidate,
             )
             .await
+            .context("IMAP failed to connect")
             {
                 Ok(client) => client,
                 Err(err) => {
-                    warn!(context, "IMAP failed to connect: {err:#}.");
+                    warn!(context, "{err:#}.");
                     first_error.get_or_insert(err);
                     continue;
                 }