From b50410ab1597a2a2cdc1d23d8ad30a67204ff3d4 Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Sat, 11 Jul 2020 17:38:48 +0200
Subject: [PATCH] Fix #1687

---
 src/configure/mod.rs | 2 +-
 src/smtp/mod.rs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/configure/mod.rs b/src/configure/mod.rs
index 0a17d3759..bd3a2b4d9 100644
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -558,7 +558,7 @@ async fn try_smtp_connections(
         return Ok(());
     }
     if was_autoconfig {
-        return Ok(());
+        bail!("No SMTP connection");
     }
     progress!(context, 850);
 
diff --git a/src/smtp/mod.rs b/src/smtp/mod.rs
index 9bdc69235..6d223bc7d 100644
--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -181,7 +181,7 @@ impl Smtp {
                 .stock_string_repl_str2(
                     StockMessage::ServerResponse,
                     format!("SMTP {}:{}", domain, port),
-                    format!("{}, ({:?})", err.to_string(), err),
+                    err.to_string(),
                 )
                 .await;