diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml
index c570043..37100f2 100644
--- a/.github/workflows/autoupdate.yml
+++ b/.github/workflows/autoupdate.yml
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 name: Auto-update PR branches
 
-# When main advances, rebase any auto-merge-armed PR that has fallen behind, so the
-# "require branches up to date" branch rule doesn't need manual branch updates. Only PRs
-# with GitHub auto-merge enabled are touched (PR_FILTER: auto_merge) — held/draft PRs are
-# left alone.
+# When main advances, rebase every open PR that has fallen behind, so the "require
+# branches up to date" branch rule doesn't need manual branch updates. All open PRs are
+# touched (PR_FILTER: all) — this is no longer limited to PRs with GitHub auto-merge
+# enabled.
 #
 # IMPORTANT: for the branch update to RE-TRIGGER the PR's CI (so it can pass and merge),
 # this must run with a PAT, not the default GITHUB_TOKEN — pushes made by GITHUB_TOKEN do
@@ -28,13 +28,13 @@ concurrency:
 
 jobs:
   autoupdate:
-    name: Auto-update armed PRs
+    name: Auto-update open PRs
     runs-on: ubuntu-latest
     environment: CI_CD
     steps:
-      - name: Update behind PRs that have auto-merge enabled
+      - name: Update all behind PRs
         uses: chinthakagodawita/autoupdate@0707656cd062a3b0cf8fa9b2cda1d1404d74437e # v1.7.0
         env:
           GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_TOKEN || secrets.GITHUB_TOKEN }}
-          PR_FILTER: "auto_merge"
+          PR_FILTER: "all"
           MERGE_CONFLICT_ACTION: "ignore"
diff --git a/app/src/main/kotlin/org/libremail/ui/LibreMailApp.kt b/app/src/main/kotlin/org/libremail/ui/LibreMailApp.kt
index fa6e750..c81f587 100644
--- a/app/src/main/kotlin/org/libremail/ui/LibreMailApp.kt
+++ b/app/src/main/kotlin/org/libremail/ui/LibreMailApp.kt
@@ -14,7 +14,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
diff --git a/app/src/main/kotlin/org/libremail/ui/accountsetup/AccountPickerScreen.kt b/app/src/main/kotlin/org/libremail/ui/accountsetup/AccountPickerScreen.kt
index aec4d7e..ce3dd1c 100644
--- a/app/src/main/kotlin/org/libremail/ui/accountsetup/AccountPickerScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/accountsetup/AccountPickerScreen.kt
@@ -43,7 +43,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 import org.libremail.domain.model.MailProvider
diff --git a/app/src/main/kotlin/org/libremail/ui/accountsetup/AppPasswordSetupScreen.kt b/app/src/main/kotlin/org/libremail/ui/accountsetup/AppPasswordSetupScreen.kt
index 1eea05b..82ec211 100644
--- a/app/src/main/kotlin/org/libremail/ui/accountsetup/AppPasswordSetupScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/accountsetup/AppPasswordSetupScreen.kt
@@ -48,7 +48,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.launch
 import org.libremail.R
diff --git a/app/src/main/kotlin/org/libremail/ui/accountsetup/ManualSetupScreen.kt b/app/src/main/kotlin/org/libremail/ui/accountsetup/ManualSetupScreen.kt
index 6d111cb..81bb451 100644
--- a/app/src/main/kotlin/org/libremail/ui/accountsetup/ManualSetupScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/accountsetup/ManualSetupScreen.kt
@@ -43,7 +43,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 import org.libremail.domain.model.MailSecurity
diff --git a/app/src/main/kotlin/org/libremail/ui/compose/ComposeScreen.kt b/app/src/main/kotlin/org/libremail/ui/compose/ComposeScreen.kt
index 4f66380..3bc28cb 100644
--- a/app/src/main/kotlin/org/libremail/ui/compose/ComposeScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/compose/ComposeScreen.kt
@@ -66,7 +66,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
diff --git a/app/src/main/kotlin/org/libremail/ui/drafts/DraftsScreen.kt b/app/src/main/kotlin/org/libremail/ui/drafts/DraftsScreen.kt
index 0fed67f..fd9036b 100644
--- a/app/src/main/kotlin/org/libremail/ui/drafts/DraftsScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/drafts/DraftsScreen.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 import org.libremail.domain.model.Draft
diff --git a/app/src/main/kotlin/org/libremail/ui/lock/AppLockGateHost.kt b/app/src/main/kotlin/org/libremail/ui/lock/AppLockGateHost.kt
index 0038671..a45cc01 100644
--- a/app/src/main/kotlin/org/libremail/ui/lock/AppLockGateHost.kt
+++ b/app/src/main/kotlin/org/libremail/ui/lock/AppLockGateHost.kt
@@ -18,7 +18,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.res.stringResource
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
diff --git a/app/src/main/kotlin/org/libremail/ui/mailbox/MailboxScreen.kt b/app/src/main/kotlin/org/libremail/ui/mailbox/MailboxScreen.kt
index 904ad1c..3e1dff9 100644
--- a/app/src/main/kotlin/org/libremail/ui/mailbox/MailboxScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/mailbox/MailboxScreen.kt
@@ -77,7 +77,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.LoadState
 import androidx.paging.compose.collectAsLazyPagingItems
diff --git a/app/src/main/kotlin/org/libremail/ui/outbox/OutboxScreen.kt b/app/src/main/kotlin/org/libremail/ui/outbox/OutboxScreen.kt
index 4caaea9..b626b0c 100644
--- a/app/src/main/kotlin/org/libremail/ui/outbox/OutboxScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/outbox/OutboxScreen.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 import org.libremail.domain.model.OutboxMessage
diff --git a/app/src/main/kotlin/org/libremail/ui/reader/ReaderScreen.kt b/app/src/main/kotlin/org/libremail/ui/reader/ReaderScreen.kt
index 0226fcd..16fe041 100644
--- a/app/src/main/kotlin/org/libremail/ui/reader/ReaderScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/reader/ReaderScreen.kt
@@ -60,7 +60,7 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.core.content.FileProvider
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 import org.libremail.domain.model.Attachment
diff --git a/app/src/main/kotlin/org/libremail/ui/reporting/ProblemReportsScreen.kt b/app/src/main/kotlin/org/libremail/ui/reporting/ProblemReportsScreen.kt
index 71367e1..0425b11 100644
--- a/app/src/main/kotlin/org/libremail/ui/reporting/ProblemReportsScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/reporting/ProblemReportsScreen.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 import org.libremail.reporting.ReportKind
diff --git a/app/src/main/kotlin/org/libremail/ui/reporting/ReportReviewScreen.kt b/app/src/main/kotlin/org/libremail/ui/reporting/ReportReviewScreen.kt
index a106a2f..56f45b2 100644
--- a/app/src/main/kotlin/org/libremail/ui/reporting/ReportReviewScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/reporting/ReportReviewScreen.kt
@@ -45,7 +45,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/kotlin/org/libremail/ui/settings/AccountSettingsScreen.kt b/app/src/main/kotlin/org/libremail/ui/settings/AccountSettingsScreen.kt
index 371b29a..361febc 100644
--- a/app/src/main/kotlin/org/libremail/ui/settings/AccountSettingsScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/settings/AccountSettingsScreen.kt
@@ -24,7 +24,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 
diff --git a/app/src/main/kotlin/org/libremail/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/org/libremail/ui/settings/SettingsScreen.kt
index 94da453..360acef 100644
--- a/app/src/main/kotlin/org/libremail/ui/settings/SettingsScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/settings/SettingsScreen.kt
@@ -41,7 +41,7 @@ import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.app.ActivityCompat
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
diff --git a/app/src/main/kotlin/org/libremail/ui/settings/SignatureEditScreen.kt b/app/src/main/kotlin/org/libremail/ui/settings/SignatureEditScreen.kt
index b656ebd..a73946f 100644
--- a/app/src/main/kotlin/org/libremail/ui/settings/SignatureEditScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/settings/SignatureEditScreen.kt
@@ -23,7 +23,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 import org.libremail.ui.compose.RichTextBodyField
diff --git a/app/src/main/kotlin/org/libremail/ui/settings/SignaturesScreen.kt b/app/src/main/kotlin/org/libremail/ui/settings/SignaturesScreen.kt
index 25ef189..9886041 100644
--- a/app/src/main/kotlin/org/libremail/ui/settings/SignaturesScreen.kt
+++ b/app/src/main/kotlin/org/libremail/ui/settings/SignaturesScreen.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.libremail.R
 import org.libremail.domain.model.Signature