diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt
index 3790cfc0f..167c6ccda 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt
@@ -114,14 +114,18 @@ data class MessagePartEntry(
         if (header != null) {
             if (other.header == null) return false
             if (!header.contentEquals(other.header)) return false
-        } else if (other.header != null) return false
+        } else if (other.header != null) {
+            return false
+        }
         if (encoding != other.encoding) return false
         if (charset != other.charset) return false
         if (dataLocation != other.dataLocation) return false
         if (data != null) {
             if (other.data == null) return false
             if (!data.contentEquals(other.data)) return false
-        } else if (other.data != null) return false
+        } else if (other.data != null) {
+            return false
+        }
         if (preamble != other.preamble) return false
         if (epilogue != other.epilogue) return false
         if (boundary != other.boundary) return false
diff --git a/gradle.properties b/gradle.properties
index 8d2c0a475..39183d0d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,8 @@ org.gradle.configuration-cache=false
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 ## Workaround for AGP still using old versions of xerces and having issues with Gradle > 8.3
 ## https://docs.gradle.org/current/userguide/upgrading_version_8.html#xml_parsing_now_requires_recent_parsers
-## remove once AGP is updated and uses a newer version XML parser
+## A fix is available in AGP 8.3.0-alpha12: https://issuetracker.google.com/issues/306301014
+## Remove this once AGP 8.3.0 works with Intellij IDEA
 systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
 systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
 systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 59efdade1..efebdb87e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -50,10 +50,10 @@ circleImageView = "3.1.0"
 ckchangelog = "2.0.0-beta02"
 clikt = "4.2.2"
 commonsIo = "2.15.1"
-dependencyCheckPlugin = "0.50.0"
-dependencyGuardPlugin = "0.4.3"
-detektPlugin = "1.23.4"
-detektPluginCompose = "0.3.9"
+dependencyCheckPlugin = "0.51.0"
+dependencyGuardPlugin = "0.5.0"
+detektPlugin = "1.23.5"
+detektPluginCompose = "0.3.11"
 fastAdapter = "5.7.0"
 forkhandlesBom = "2.13.1.0"
 glide = "4.16.0"
@@ -77,7 +77,7 @@ kotlin = "1.9.22"
 kotlinKsp = "1.9.22-1.0.17"
 kotlinxCoroutines = "1.8.0"
 kotlinxDateTime = "0.5.0"
-ktlint = "1.0.1"
+ktlint = "1.1.1"
 kxml2 = "1.0"
 leakcanary = "2.13"
 materialDrawer = "8.4.5"
@@ -92,7 +92,7 @@ preferencesFix = "1.1.0"
 robolectric = "4.11.1"
 safeContentResolver = "1.0.0"
 searchPreference = "v2.3.0"
-spotlessPlugin = "6.23.3"
+spotlessPlugin = "6.25.0"
 timber = "5.0.1"
 tokenautocomplete = "4.0.0-beta01"
 turbine = "0.13.0"