diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderState.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderState.kt
index c6971f417..c8a9eb717 100644
--- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderState.kt
+++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderState.kt
@@ -1,7 +1,34 @@
 package app.k9mail.feature.account.setup.ui.autoconfig.view
 
-sealed interface AutoDiscoveryStatusHeaderState {
-    object NoSettings : AutoDiscoveryStatusHeaderState
-    object Trusted : AutoDiscoveryStatusHeaderState
-    object Untrusted : AutoDiscoveryStatusHeaderState
+import androidx.annotation.StringRes
+import androidx.compose.ui.graphics.vector.ImageVector
+import app.k9mail.core.ui.compose.theme.Icons
+import app.k9mail.feature.account.setup.R
+
+enum class AutoDiscoveryStatusHeaderState(
+    val icon: ImageVector,
+    @StringRes val titleResourceId: Int,
+    @StringRes val subtitleResourceId: Int,
+    val isExpandable: Boolean,
+) {
+    NoSettings(
+        icon = Icons.Outlined.info,
+        titleResourceId = R.string.account_setup_auto_config_status_header_title_configuration_not_found,
+        subtitleResourceId = R.string.account_setup_auto_config_status_header_subtitle_configuration_not_found,
+        isExpandable = false,
+    ),
+
+    Trusted(
+        icon = Icons.Outlined.check,
+        titleResourceId = R.string.account_setup_auto_config_status_header_title_configuration_found,
+        subtitleResourceId = R.string.account_setup_auto_config_status_header_subtitle_configuration_trusted,
+        isExpandable = true,
+    ),
+
+    Untrusted(
+        icon = Icons.Outlined.info,
+        titleResourceId = R.string.account_setup_auto_config_status_header_title_configuration_found,
+        subtitleResourceId = R.string.account_setup_auto_config_status_header_subtitle_configuration_untrusted,
+        isExpandable = true,
+    ),
 }
diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderView.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderView.kt
index 10eb7a761..6f607e153 100644
--- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderView.kt
+++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderView.kt
@@ -17,7 +17,6 @@ import app.k9mail.core.ui.compose.designsystem.atom.text.TextHeadline6
 import app.k9mail.core.ui.compose.theme.Icons
 import app.k9mail.core.ui.compose.theme.MainTheme
 import app.k9mail.core.ui.compose.theme.PreviewWithThemes
-import app.k9mail.feature.account.setup.R
 
 @Suppress("LongMethod")
 @Composable
@@ -33,13 +32,10 @@ internal fun AutoDiscoveryStatusHeaderView(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
-            imageVector = when (state) {
-                AutoDiscoveryStatusHeaderState.NoSettings -> Icons.Outlined.info
-                AutoDiscoveryStatusHeaderState.Trusted -> Icons.Outlined.check
-                AutoDiscoveryStatusHeaderState.Untrusted -> Icons.Outlined.info
-            },
+            imageVector = state.icon,
             tint = selectColor(state),
-            modifier = Modifier.padding(MainTheme.spacings.default)
+            modifier = Modifier
+                .padding(MainTheme.spacings.default)
                 .requiredSize(MainTheme.sizes.medium),
         )
         Column(
@@ -52,40 +48,14 @@ internal fun AutoDiscoveryStatusHeaderView(
                 ),
         ) {
             TextHeadline6(
-                text = stringResource(
-                    id = when (state) {
-                        AutoDiscoveryStatusHeaderState.NoSettings -> {
-                            R.string.account_setup_auto_config_status_header_title_configuration_not_found
-                        }
-
-                        AutoDiscoveryStatusHeaderState.Trusted,
-                        AutoDiscoveryStatusHeaderState.Untrusted,
-                        -> {
-                            R.string.account_setup_auto_config_status_header_title_configuration_found
-                        }
-                    },
-                ),
+                text = stringResource(state.titleResourceId),
             )
             TextBody2(
-                text = stringResource(
-                    when (state) {
-                        AutoDiscoveryStatusHeaderState.NoSettings -> {
-                            R.string.account_setup_auto_config_status_header_subtitle_configuration_not_found
-                        }
-
-                        AutoDiscoveryStatusHeaderState.Trusted -> {
-                            R.string.account_setup_auto_config_status_header_subtitle_configuration_trusted
-                        }
-
-                        AutoDiscoveryStatusHeaderState.Untrusted -> {
-                            R.string.account_setup_auto_config_status_header_subtitle_configuration_untrusted
-                        }
-                    },
-                ),
+                text = stringResource(state.subtitleResourceId),
                 color = selectColor(state),
             )
         }
-        if (state != AutoDiscoveryStatusHeaderState.NoSettings) {
+        if (state.isExpandable) {
             Icon(
                 imageVector = if (isExpanded) Icons.Outlined.expandLess else Icons.Outlined.expandMore,
                 modifier = Modifier.padding(MainTheme.spacings.default),