diff --git a/src/configure.rs b/src/configure.rs
index e72315e7e4..282c931d36 100644
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -272,14 +272,16 @@ impl Context {
                 )
                 .await?
         {
-            if self.get_config(Config::MvboxMove).await?.as_deref() != Some("0") {
+            // Should be checked before `MvboxMove` because the latter makes no sense in presense of
+            // `OnlyFetchMvbox` and even grayed out in the UIs in this case.
+            if self.get_config(Config::OnlyFetchMvbox).await?.as_deref() != Some("0") {
                 bail!(
-                    "To use additional relays, disable the legacy option \"Settings / Advanced / Move automatically to DeltaChat Folder\"."
+                    "To use additional relays, disable the legacy option \"Settings / Advanced / Only Fetch from DeltaChat Folder\"."
                 );
             }
-            if self.get_config(Config::OnlyFetchMvbox).await?.as_deref() != Some("0") {
+            if self.get_config(Config::MvboxMove).await?.as_deref() != Some("0") {
                 bail!(
-                    "To use additional relays, disable the legacy option \"Settings / Advanced / Only Fetch from DeltaChat Folder\"."
+                    "To use additional relays, disable the legacy option \"Settings / Advanced / Move automatically to DeltaChat Folder\"."
                 );
             }
             if self.get_config(Config::ShowEmails).await?.as_deref() != Some("2") {