diff --git a/build.gradle b/build.gradle
index c6c338c629..abe2c5f655 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ configurations {
 }
 
 dependencies {
-    playstoreImplementation('com.google.firebase:firebase-messaging:23.0.2') {
+    playstoreImplementation('com.google.firebase:firebase-messaging:23.0.5') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -50,7 +50,7 @@ dependencies {
     //implementation 'org.webrtc:google-webrtc:1.0.32006'
     implementation 'org.bouncycastle:bcmail-jdk15on:1.64'
     implementation 'org.gnu.inet:libidn:1.15'
-    implementation 'com.google.zxing:core:3.3.3' // > 3.3.x not working below SDK 24
+    implementation 'com.google.zxing:core:3.5.0' // > 3.3.x not working below SDK 24
     implementation 'de.measite.minidns:minidns-hla:0.2.4'
     implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
     implementation 'org.whispersystems:signal-protocol-java:2.6.2'
@@ -59,20 +59,20 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1' // 1.4.0 needs minCompileSdk 31
+    implementation 'androidx.appcompat:appcompat:1.4.2' // 1.4.0 needs minCompileSdk 31
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.emoji2:emoji2:1.1.0-rc01"
-    gitImplementation "androidx.emoji2:emoji2-bundled:1.1.0-rc01"
+    implementation "androidx.emoji2:emoji2:1.2.0-alpha04"
+    gitImplementation "androidx.emoji2:emoji2-bundled:1.2.0-alpha04"
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.cardview:cardview:1.0.0' // for compatibility
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.15.0'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.0'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.18.0'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.18.0'
     implementation 'com.wefika:flowlayout:0.4.1'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
-    implementation 'org.jxmpp:jxmpp-jid:1.0.2'
+    implementation 'org.jxmpp:jxmpp-jid:1.0.3'
     implementation 'org.hsluv:hsluv:0.2'
     implementation 'org.conscrypt:conscrypt-android:2.5.2'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'
@@ -80,7 +80,7 @@ dependencies {
     implementation 'org.osmdroid:osmdroid-android:6.1.11'
     implementation 'com.leinardi.android:speed-dial:3.2.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.google.guava:guava:31.0.1-android'
@@ -102,7 +102,7 @@ android {
     compileSdkVersion 31
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
 
         //versionNameSuffix " beta_(2021-12-19)" // " beta_(XXXX-XX-XX)" // activate for beta versions
diff --git a/src/main/java/eu/siacs/conversations/ui/MediaViewerActivity.java b/src/main/java/eu/siacs/conversations/ui/MediaViewerActivity.java
index c620100ed8..4e9ef70048 100644
--- a/src/main/java/eu/siacs/conversations/ui/MediaViewerActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/MediaViewerActivity.java
@@ -32,6 +32,7 @@ import androidx.databinding.DataBindingUtil;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
@@ -331,7 +332,7 @@ public class MediaViewerActivity extends XmppActivity implements AudioManager.On
             player.setRepeatMode(Player.REPEAT_MODE_OFF);
             binding.messageVideoView.setPlayer(player);
             DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this, System.getProperty("http.agent"));
-            MediaSource videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
+            MediaSource videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(MediaItem.fromUri(uri));
             player.prepare(videoSource);
             requestAudioFocus();
             setVolumeControlStream(AudioManager.STREAM_MUSIC);