diff --git a/src/configure/mod.rs b/src/configure/mod.rs
index bea7d85bf..a962340ae 100644
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -7,7 +7,7 @@ mod server_params;
 
 use anyhow::{bail, ensure, Context as _, Result};
 use async_std::prelude::*;
-use async_std::task;
+//use async_std::task;
 use itertools::Itertools;
 use job::Action;
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
@@ -163,8 +163,8 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
         DC_LP_AUTH_NORMAL as i32
     };
 
-    let ctx2 = ctx.clone();
-    let update_device_chats_handle = task::spawn(async move { ctx2.update_device_chats().await });
+    //let ctx2 = ctx.clone();
+    //let update_device_chats_handle = task::spawn(async move { ctx2.update_device_chats().await });
 
     // Step 1: Load the parameters and check email-address and password
 
@@ -258,7 +258,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
         .cloned()
         .collect();
 
-    let smtp_config_task = task::spawn(async move {
+    //let smtp_config_task = task::spawn(async move {
         let mut smtp_configured = false;
         let mut errors = Vec::new();
         for smtp_server in smtp_servers {
@@ -278,12 +278,10 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
             }
         }
 
-        if smtp_configured {
-            Ok(smtp_param)
-        } else {
-            Err(errors)
+        if !smtp_configured {
+            bail!(nicer_configuration_error(ctx, errors).await);
         }
-    });
+    //});
 
     progress!(ctx, 600);
 
@@ -323,14 +321,14 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     progress!(ctx, 850);
 
     // Wait for SMTP configuration
-    match smtp_config_task.await {
+    /*match smtp_config_task.await {
         Ok(smtp_param) => {
             param.smtp = smtp_param;
         }
         Err(errors) => {
             bail!(nicer_configuration_error(ctx, errors).await);
         }
-    }
+    }*/
 
     progress!(ctx, 900);
 
@@ -364,7 +362,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     .await;
 
     progress!(ctx, 940);
-    update_device_chats_handle.await?;
+    //update_device_chats_handle.await?;
 
     Ok(())
 }