diff --git a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
index 5516275f6a4..9cae1b3e2f4 100644
--- a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
@@ -233,16 +233,15 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4
 org.apache.httpcomponents.core5:httpcore5:5.3.4
 org.apache.james:apache-mime4j-core:0.8.13
 org.apache.james:apache-mime4j-dom:0.8.13
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.savedstate:savedstate:1.3.1
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4
 org.jetbrains.compose.animation:animation-core:1.8.2
 org.jetbrains.compose.animation:animation:1.8.2
-org.jetbrains.compose.annotation-internal:annotation:1.8.2
+org.jetbrains.compose.annotation-internal:annotation:1.9.0
 org.jetbrains.compose.collection-internal:collection:1.8.2
 org.jetbrains.compose.components:components-resources-android:1.8.2
 org.jetbrains.compose.components:components-resources:1.8.2
diff --git a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
index 38c56add0bd..b587854dc3f 100644
--- a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
@@ -247,16 +247,15 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4
 org.apache.httpcomponents.core5:httpcore5:5.3.4
 org.apache.james:apache-mime4j-core:0.8.13
 org.apache.james:apache-mime4j-dom:0.8.13
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.savedstate:savedstate:1.3.1
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4
 org.jetbrains.compose.animation:animation-core:1.8.2
 org.jetbrains.compose.animation:animation:1.8.2
-org.jetbrains.compose.annotation-internal:annotation:1.8.2
+org.jetbrains.compose.annotation-internal:annotation:1.9.0
 org.jetbrains.compose.collection-internal:collection:1.8.2
 org.jetbrains.compose.components:components-resources-android:1.8.2
 org.jetbrains.compose.components:components-resources:1.8.2
diff --git a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
index 9483aa6aa3a..27610d1fa59 100644
--- a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
@@ -240,16 +240,15 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4
 org.apache.httpcomponents.core5:httpcore5:5.3.4
 org.apache.james:apache-mime4j-core:0.8.13
 org.apache.james:apache-mime4j-dom:0.8.13
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.savedstate:savedstate:1.3.1
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4
 org.jetbrains.compose.animation:animation-core:1.8.2
 org.jetbrains.compose.animation:animation:1.8.2
-org.jetbrains.compose.annotation-internal:annotation:1.8.2
+org.jetbrains.compose.annotation-internal:annotation:1.9.0
 org.jetbrains.compose.collection-internal:collection:1.8.2
 org.jetbrains.compose.components:components-resources-android:1.8.2
 org.jetbrains.compose.components:components-resources:1.8.2
diff --git a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
index 9483aa6aa3a..27610d1fa59 100644
--- a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
@@ -240,16 +240,15 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4
 org.apache.httpcomponents.core5:httpcore5:5.3.4
 org.apache.james:apache-mime4j-core:0.8.13
 org.apache.james:apache-mime4j-dom:0.8.13
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.savedstate:savedstate:1.3.1
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4
 org.jetbrains.compose.animation:animation-core:1.8.2
 org.jetbrains.compose.animation:animation:1.8.2
-org.jetbrains.compose.annotation-internal:annotation:1.8.2
+org.jetbrains.compose.annotation-internal:annotation:1.9.0
 org.jetbrains.compose.collection-internal:collection:1.8.2
 org.jetbrains.compose.components:components-resources-android:1.8.2
 org.jetbrains.compose.components:components-resources:1.8.2
diff --git a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
index 9483aa6aa3a..27610d1fa59 100644
--- a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
@@ -240,16 +240,15 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4
 org.apache.httpcomponents.core5:httpcore5:5.3.4
 org.apache.james:apache-mime4j-core:0.8.13
 org.apache.james:apache-mime4j-dom:0.8.13
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.savedstate:savedstate:1.3.1
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4
 org.jetbrains.compose.animation:animation-core:1.8.2
 org.jetbrains.compose.animation:animation:1.8.2
-org.jetbrains.compose.annotation-internal:annotation:1.8.2
+org.jetbrains.compose.annotation-internal:annotation:1.9.0
 org.jetbrains.compose.collection-internal:collection:1.8.2
 org.jetbrains.compose.components:components-resources-android:1.8.2
 org.jetbrains.compose.components:components-resources:1.8.2
diff --git a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
index 551b99a578f..0ef55b6c6c5 100644
--- a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
@@ -254,16 +254,15 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4
 org.apache.httpcomponents.core5:httpcore5:5.3.4
 org.apache.james:apache-mime4j-core:0.8.13
 org.apache.james:apache-mime4j-dom:0.8.13
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.savedstate:savedstate:1.3.1
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4
 org.jetbrains.compose.animation:animation-core:1.8.2
 org.jetbrains.compose.animation:animation:1.8.2
-org.jetbrains.compose.annotation-internal:annotation:1.8.2
+org.jetbrains.compose.annotation-internal:annotation:1.9.0
 org.jetbrains.compose.collection-internal:collection:1.8.2
 org.jetbrains.compose.components:components-resources-android:1.8.2
 org.jetbrains.compose.components:components-resources:1.8.2
diff --git a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
index 551b99a578f..0ef55b6c6c5 100644
--- a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
@@ -254,16 +254,15 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4
 org.apache.httpcomponents.core5:httpcore5:5.3.4
 org.apache.james:apache-mime4j-core:0.8.13
 org.apache.james:apache-mime4j-dom:0.8.13
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.savedstate:savedstate:1.3.1
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4
 org.jetbrains.compose.animation:animation-core:1.8.2
 org.jetbrains.compose.animation:animation:1.8.2
-org.jetbrains.compose.annotation-internal:annotation:1.8.2
+org.jetbrains.compose.annotation-internal:annotation:1.9.0
 org.jetbrains.compose.collection-internal:collection:1.8.2
 org.jetbrains.compose.components:components-resources-android:1.8.2
 org.jetbrains.compose.components:components-resources:1.8.2
diff --git a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
index 551b99a578f..0ef55b6c6c5 100644
--- a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
@@ -254,16 +254,15 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.4
 org.apache.httpcomponents.core5:httpcore5:5.3.4
 org.apache.james:apache-mime4j-core:0.8.13
 org.apache.james:apache-mime4j-dom:0.8.13
-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.savedstate:savedstate:1.3.1
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4
 org.jetbrains.compose.animation:animation-core:1.8.2
 org.jetbrains.compose.animation:animation:1.8.2
-org.jetbrains.compose.annotation-internal:annotation:1.8.2
+org.jetbrains.compose.annotation-internal:annotation:1.9.0
 org.jetbrains.compose.collection-internal:collection:1.8.2
 org.jetbrains.compose.components:components-resources-android:1.8.2
 org.jetbrains.compose.components:components-resources:1.8.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 46ffdf30523..e0d0b1e338a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@ javaDiffUtils = "4.16"
 jcipAnnotations = "1.0"
 jetbrainsAnnotations = "26.0.2"
 jetbrainsCompose = "1.8.2"
-jetbrainsComposeLifecycle = "2.9.1"
+jetbrainsComposeLifecycle = "2.9.4"
 jetbrainsComposeNavigation = "2.9.0"
 jdom = "2.0.6.1"
 jmapClient = "0.3.1"