diff --git a/src/configure/auto_outlook.rs b/src/configure/auto_outlook.rs
index 6a54c0830..da25b28c6 100644
--- a/src/configure/auto_outlook.rs
+++ b/src/configure/auto_outlook.rs
@@ -114,7 +114,7 @@ fn finish_settings(event: &BytesEnd, outlk_ad: &mut outlk_autodiscover_t) {
         }
         let type_val = *type_val;
         if !outlk_ad.out_imap_set && type_val == "imap" {
-            outlk_ad.out.mail_server = config.get("server"); //.unwrap_or_default();
+            outlk_ad.out.mail_server = config.get("server").unwrap_or("".to_string());
             outlk_ad.out.mail_port = port;
             if ssl_on {
                 outlk_ad.out.server_flags |= DC_LP_IMAP_SOCKET_SSL as i32;
diff --git a/src/job.rs b/src/job.rs
index 4b2ba162f..e1546093a 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -12,7 +12,7 @@ use crate::dc_tools::*;
 use crate::error::Error;
 use crate::events::Event;
 use crate::imap::*;
-use crate::imex::*;
+use crate::imex::job_do_DC_JOB_IMEX_IMAP;
 use crate::location;
 use crate::login_param::LoginParam;
 use crate::message::{self, Message, MessageState};
@@ -781,13 +781,8 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
                 Action::MarkseenMdnOnImap => job.do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context),
                 Action::MoveMsg => job.do_DC_JOB_MOVE_MSG(context),
                 Action::SendMdn => job.do_DC_JOB_SEND(context),
+                Action::ImexImap => job_do_DC_JOB_IMEX_IMAP(context, &job),
                 Action::ConfigureImap => dc_job_do_DC_JOB_CONFIGURE_IMAP(context),
-                Action::ImexImap => match dc_job_do_DC_JOB_IMEX_IMAP(context) {
-                    Ok(()) => {}
-                    Err(err) => {
-                        error!(context, "{}", err);
-                    }
-                },
                 Action::MaybeSendLocations => {
                     location::job_do_DC_JOB_MAYBE_SEND_LOCATIONS(context, &job)
                 }