diff --git a/python/tests/test_account.py b/python/tests/test_account.py
index 497dba172..f8603f897 100644
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -637,7 +637,8 @@ class TestOnlineAccount:
         ev_msg = ac1_clone._evtracker.wait_next_messages_changed()
         assert ev_msg.text == msg_out.text
 
-    def test_mark_read_on_server(self, acfactory, lp):
+    @pytest.mark.parametrize('i', range(30))
+    def test_mark_read_on_server(self, acfactory, lp, i):
         ac1 = acfactory.get_online_configuring_account()
         ac2 = acfactory.get_online_configuring_account(mvbox=True, move=True)
 
diff --git a/src/configure/mod.rs b/src/configure/mod.rs
index 1519739fe..b15a1a3d1 100644
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -272,9 +272,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     let create_mvbox = ctx.get_config_bool(Config::MvboxWatch).await
         || ctx.get_config_bool(Config::MvboxMove).await;
 
-    imap.configure_folders(ctx, create_mvbox)
-        .await
-        .context("configuring folders failed")?;
+    imap.configure_folders(ctx, create_mvbox).await?;
 
     imap.select_with_uidvalidity(ctx, "INBOX")
         .await
diff --git a/src/job.rs b/src/job.rs
index 81c97b1f0..c0a8c1b91 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -1062,12 +1062,12 @@ pub(crate) async fn load_next(
         query = r#"
 SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries
 FROM jobs
-WHERE foreign_id=?
+WHERE thread=? AND foreign_id=?
 ORDER BY action DESC, added_timestamp
 LIMIT 1;
 "#;
         m = msg_id;
-        params = paramsv![m];
+        params = paramsv![thread_i, m];
     } else if !info.probe_network {
         // processing for first-try and after backoff-timeouts:
         // process jobs in the order they were added.