diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 72bd8b6041..4511f07681 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -42,4 +42,10 @@ updates:
       applies-to: version-updates
       patterns:
         - "com.squareup.okhttp3*"
+
+    kotlin:
+      applies-to: version-updates
+      patterns:
+        - "org.jetbrains.kotlin*"
+        - "com.google.devtools.ksp*"
   open-pull-requests-limit: 10
diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts
index c8e4f9f07a..98a07680ab 100644
--- a/FlowCrypt/build.gradle.kts
+++ b/FlowCrypt/build.gradle.kts
@@ -406,7 +406,7 @@ dependencies {
   testImplementation("com.shazam:shazamcrest:0.11")
   testImplementation("org.robolectric:robolectric:4.14.1")
   //we need it to test Parcelable implementation
-  testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.1.10")
+  testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.1.20")
   testImplementation("junit:junit:4.13.2")
   testImplementation("androidx.room:room-testing:2.6.1")
   testImplementation("io.github.classgraph:classgraph:4.8.179")
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt
index a8102d99f1..9bad8f7342 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt
@@ -703,7 +703,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application
           )
         )
 
-        val nextPageToken: String
+        val nextPageToken: String?
         val gmailThreadInfoList: List<GmailThreadInfo>
         val messages = if (accountEntity.useConversationMode) {
           val threadsResponse = GmailApiHelper.loadThreads(
diff --git a/build.gradle.kts b/build.gradle.kts
index 6cf233b33e..6860df9821 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,11 +7,11 @@
 
 plugins {
   id("com.android.application") version "8.9.0" apply false
-  id("org.jetbrains.kotlin.android") version "2.1.10" apply false
+  id("org.jetbrains.kotlin.android") version "2.1.20" apply false
   id("androidx.navigation.safeargs.kotlin") version "2.8.9" apply false
   id("com.starter.easylauncher") version "6.4.0" apply false
-  id("org.jetbrains.kotlin.plugin.parcelize") version "2.1.10" apply false
-  id("com.google.devtools.ksp") version "2.1.10-1.0.31" apply false
+  id("org.jetbrains.kotlin.plugin.parcelize") version "2.1.20" apply false
+  id("com.google.devtools.ksp") version "2.1.20-1.0.31" apply false
   id("org.ajoberstar.grgit") version "5.3.0" apply false
 }