From 3035c8af30194f32bcafed065eb73fd8850acd20 Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Mon, 4 May 2020 16:35:42 +0300
Subject: [PATCH 1/2] Always describe the context of the displayed error

---
 src/job.rs     | 2 +-
 src/message.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/job.rs b/src/job.rs
index 7e101b9f6..32eea25fd 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -1190,7 +1190,7 @@ fn perform_job_action(context: &Context, mut job: &mut Job, thread: Thread, trie
         Action::ImexImap => match JobImexImap(context, &job) {
             Ok(()) => Status::Finished(Ok(())),
             Err(err) => {
-                error!(context, "{}", err);
+                error!(context, "Import/export failed: {}", err);
                 Status::Finished(Err(err))
             }
         },
diff --git a/src/message.rs b/src/message.rs
index 732ad4c26..8668adef4 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1215,7 +1215,7 @@ pub fn set_msg_failed(context: &Context, msg_id: MsgId, error: Option<impl AsRef
         }
         if let Some(error) = error {
             msg.param.set(Param::Error, error.as_ref());
-            error!(context, "{}", error.as_ref());
+            error!(context, "Message failed: {}", error.as_ref());
         }
 
         if sql::execute(

From 076cdae3fd584eebb8fa003b873013fccaff7993 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 5 May 2020 21:44:03 +0200
Subject: [PATCH 2/2] do not show errors during sending as a ephemeral popup or
 so, just set the message-state to failed, the error can be queried by the
 user at any time via 'Info' or so

---
 src/message.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/message.rs b/src/message.rs
index 8668adef4..d96833ee7 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1215,7 +1215,7 @@ pub fn set_msg_failed(context: &Context, msg_id: MsgId, error: Option<impl AsRef
         }
         if let Some(error) = error {
             msg.param.set(Param::Error, error.as_ref());
-            error!(context, "Message failed: {}", error.as_ref());
+            warn!(context, "Message failed: {}", error.as_ref());
         }
 
         if sql::execute(