diff --git a/src/imap/mod.rs b/src/imap/mod.rs
index f9bfcaf08..6a6e251cf 100644
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -269,7 +269,7 @@ impl Imap {
                     let imap_port = config.imap_port;
                     context.stock_string_repl_str2(
                         StockMessage::ServerResponse,
-                        format!("{}:{}", imap_server, imap_port),
+                        format!("IMAP {}:{}", imap_server, imap_port),
                         err.to_string(),
                     )
                 };
diff --git a/src/smtp/mod.rs b/src/smtp/mod.rs
index 83f9106e3..b8e698087 100644
--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -12,6 +12,7 @@ use crate::context::Context;
 use crate::events::Event;
 use crate::login_param::{dc_build_tls, LoginParam};
 use crate::oauth2::*;
+use crate::stock::StockMessage;
 
 /// SMTP write and read timeout in seconds.
 const SMTP_TIMEOUT: u64 = 30;
@@ -171,7 +172,14 @@ impl Smtp {
         let mut trans = client.into_transport();
 
         trans.connect().await.map_err(|err| {
-            emit_event!(context, Event::ErrorNetwork(err.to_string()));
+            let message = {
+                context.stock_string_repl_str2(
+                    StockMessage::ServerResponse,
+                    format!("SMTP {}:{}", domain, port),
+                    err.to_string(),
+                )
+            };
+            emit_event!(context, Event::ErrorNetwork(message));
             Error::ConnectionFailure(err)
         })?;