diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts
index cf5441e860..0b7b1024d7 100644
--- a/app-k9mail/build.gradle.kts
+++ b/app-k9mail/build.gradle.kts
@@ -18,10 +18,12 @@ dependencies {
     implementation(projects.app.ui.legacy)
     implementation(projects.app.ui.messageListWidget)
 
-    debugImplementation(projects.backend.demo)
-
     implementation(libs.androidx.work.runtime)
 
+    implementation(projects.feature.autodiscovery.api)
+    debugImplementation(projects.backend.demo)
+    debugImplementation(projects.feature.autodiscovery.demo)
+
     testImplementation(libs.robolectric)
 
     // Required for DependencyInjectionTest to be able to resolve OpenPgpApiManager
diff --git a/app-k9mail/src/debug/kotlin/app/k9mail/dev/DebugConfig.kt b/app-k9mail/src/debug/kotlin/app/k9mail/dev/DebugConfig.kt
index 90ffc4ed81..37ab465391 100644
--- a/app-k9mail/src/debug/kotlin/app/k9mail/dev/DebugConfig.kt
+++ b/app-k9mail/src/debug/kotlin/app/k9mail/dev/DebugConfig.kt
@@ -1,5 +1,7 @@
 package app.k9mail.dev
 
+import app.k9mail.autodiscovery.api.AutoDiscovery
+import app.k9mail.autodiscovery.demo.DemoAutoDiscovery
 import com.fsck.k9.backend.BackendFactory
 import org.koin.core.module.Module
 import org.koin.core.qualifier.named
@@ -9,4 +11,7 @@ fun Module.developmentModuleAdditions() {
     single<Map<String, BackendFactory>>(named("developmentBackends")) {
         mapOf("demo" to get<DemoBackendFactory>())
     }
+    single<List<AutoDiscovery>>(named("extraAutoDiscoveries")) {
+        listOf(DemoAutoDiscovery())
+    }
 }
diff --git a/app-k9mail/src/release/kotlin/app/k9mail/dev/ReleaseConfig.kt b/app-k9mail/src/release/kotlin/app/k9mail/dev/ReleaseConfig.kt
index d368a418f6..44f85e783c 100644
--- a/app-k9mail/src/release/kotlin/app/k9mail/dev/ReleaseConfig.kt
+++ b/app-k9mail/src/release/kotlin/app/k9mail/dev/ReleaseConfig.kt
@@ -1,5 +1,6 @@
 package app.k9mail.dev
 
+import app.k9mail.autodiscovery.api.AutoDiscovery
 import com.fsck.k9.backend.BackendFactory
 import org.koin.core.module.Module
 import org.koin.core.qualifier.named
@@ -8,4 +9,7 @@ fun Module.developmentModuleAdditions() {
     single<Map<String, BackendFactory>>(named("developmentBackends")) {
         emptyMap()
     }
+    single<List<AutoDiscovery>>(named("extraAutoDiscoveries")) {
+        emptyList()
+    }
 }
diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts
index d9faf98706..15c818e83d 100644
--- a/app-thunderbird/build.gradle.kts
+++ b/app-thunderbird/build.gradle.kts
@@ -18,10 +18,12 @@ dependencies {
     implementation(projects.app.ui.legacy)
     implementation(projects.app.ui.messageListWidget)
 
-    debugImplementation(projects.backend.demo)
-
     implementation(libs.androidx.work.runtime)
 
+    implementation(projects.feature.autodiscovery.api)
+    debugImplementation(projects.backend.demo)
+    debugImplementation(projects.feature.autodiscovery.demo)
+
     testImplementation(libs.robolectric)
 
     // Required for DependencyInjectionTest to be able to resolve OpenPgpApiManager
diff --git a/app-thunderbird/src/beta/kotlin/net/thunderbird/android/dev/BetaConfig.kt b/app-thunderbird/src/beta/kotlin/net/thunderbird/android/dev/BetaConfig.kt
index 23c442f206..2df3a5d5b1 100644
--- a/app-thunderbird/src/beta/kotlin/net/thunderbird/android/dev/BetaConfig.kt
+++ b/app-thunderbird/src/beta/kotlin/net/thunderbird/android/dev/BetaConfig.kt
@@ -1,5 +1,6 @@
 package net.thunderbird.android.dev
 
+import app.k9mail.autodiscovery.api.AutoDiscovery
 import com.fsck.k9.backend.BackendFactory
 import org.koin.core.module.Module
 import org.koin.core.qualifier.named
@@ -8,4 +9,7 @@ fun Module.developmentModuleAdditions() {
     single<Map<String, BackendFactory>>(named("developmentBackends")) {
         emptyMap()
     }
+    single<List<AutoDiscovery>>(named("extraAutoDiscoveries")) {
+        emptyList()
+    }
 }
diff --git a/app-thunderbird/src/daily/kotlin/net/thunderbird/android/dev/DailyConfig.kt b/app-thunderbird/src/daily/kotlin/net/thunderbird/android/dev/DailyConfig.kt
index 23c442f206..2df3a5d5b1 100644
--- a/app-thunderbird/src/daily/kotlin/net/thunderbird/android/dev/DailyConfig.kt
+++ b/app-thunderbird/src/daily/kotlin/net/thunderbird/android/dev/DailyConfig.kt
@@ -1,5 +1,6 @@
 package net.thunderbird.android.dev
 
+import app.k9mail.autodiscovery.api.AutoDiscovery
 import com.fsck.k9.backend.BackendFactory
 import org.koin.core.module.Module
 import org.koin.core.qualifier.named
@@ -8,4 +9,7 @@ fun Module.developmentModuleAdditions() {
     single<Map<String, BackendFactory>>(named("developmentBackends")) {
         emptyMap()
     }
+    single<List<AutoDiscovery>>(named("extraAutoDiscoveries")) {
+        emptyList()
+    }
 }
diff --git a/app-thunderbird/src/debug/kotlin/net/thunderbird/android/dev/DebugConfig.kt b/app-thunderbird/src/debug/kotlin/net/thunderbird/android/dev/DebugConfig.kt
index 1f884d6f03..13a6152bcc 100644
--- a/app-thunderbird/src/debug/kotlin/net/thunderbird/android/dev/DebugConfig.kt
+++ b/app-thunderbird/src/debug/kotlin/net/thunderbird/android/dev/DebugConfig.kt
@@ -1,5 +1,7 @@
 package net.thunderbird.android.dev
 
+import app.k9mail.autodiscovery.api.AutoDiscovery
+import app.k9mail.autodiscovery.demo.DemoAutoDiscovery
 import com.fsck.k9.backend.BackendFactory
 import org.koin.core.module.Module
 import org.koin.core.qualifier.named
@@ -9,4 +11,7 @@ fun Module.developmentModuleAdditions() {
     single<Map<String, BackendFactory>>(named("developmentBackends")) {
         mapOf("demo" to get<DemoBackendFactory>())
     }
+    single<List<AutoDiscovery>>(named("extraAutoDiscoveries")) {
+        listOf(DemoAutoDiscovery())
+    }
 }
diff --git a/app-thunderbird/src/release/kotlin/net/thunderbird/android/dev/ReleaseConfig.kt b/app-thunderbird/src/release/kotlin/net/thunderbird/android/dev/ReleaseConfig.kt
index 23c442f206..2df3a5d5b1 100644
--- a/app-thunderbird/src/release/kotlin/net/thunderbird/android/dev/ReleaseConfig.kt
+++ b/app-thunderbird/src/release/kotlin/net/thunderbird/android/dev/ReleaseConfig.kt
@@ -1,5 +1,6 @@
 package net.thunderbird.android.dev
 
+import app.k9mail.autodiscovery.api.AutoDiscovery
 import com.fsck.k9.backend.BackendFactory
 import org.koin.core.module.Module
 import org.koin.core.qualifier.named
@@ -8,4 +9,7 @@ fun Module.developmentModuleAdditions() {
     single<Map<String, BackendFactory>>(named("developmentBackends")) {
         emptyMap()
     }
+    single<List<AutoDiscovery>>(named("extraAutoDiscoveries")) {
+        emptyList()
+    }
 }