diff --git a/app/build.gradle b/app/build.gradle
index b511755d7..49fbfcce0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,7 +177,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "com.vanniktech:emoji-google:0.15.0"
+    implementation "com.vanniktech:emoji-google:0.16.0"
     implementation "androidx.emoji2:emoji2:${emojiVersion}"
     implementation "androidx.emoji2:emoji2-bundled:${emojiVersion}"
     implementation "androidx.emoji2:emoji2-views:${emojiVersion}"
@@ -187,7 +187,7 @@ dependencies {
     implementation "androidx.work:work-rxjava2:${workVersion}"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     androidTestImplementation "androidx.work:work-testing:${workVersion}"
-    implementation 'com.google.android:flexbox:2.0.1'
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation ('com.gitlab.bitfireAT:dav4jvm:2.1.3', {
         exclude group: 'org.ogce', module: 'xpp3'	// Android comes with its own XmlPullParser
     })
@@ -248,7 +248,9 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'com.github.wooplr:Spotlight:1.3'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    implementation 'com.github.nextcloud-deps:ChatKit:0.4.0'
+    implementation ('com.github.nextcloud-deps:ChatKit:0.4.0', {
+        exclude group: 'com.google.android', module: 'flexbox'	// replaced by v3 not yet used here
+    })
 
     implementation 'joda-time:joda-time:2.12.4'
     implementation "io.coil-kt:coil:${coilKtVersion}"