diff --git a/app/build.gradle b/app/build.gradle
index 726993a..885345e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,9 +49,10 @@ dependencies {
     annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
     implementation 'com.hypertrack:hyperlog:0.0.10'
     implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'ru.noties.markwon:core:3.0.0'
-    implementation 'ru.noties.markwon:image-gif:3.0.0'
-    implementation 'ru.noties.markwon:ext-tables:3.0.0'
+    implementation 'io.noties.markwon:core:4.2.0'
+    implementation 'io.noties.markwon:image-picasso:4.2.0'
+    implementation 'io.noties.markwon:image:4.2.0'
+    implementation 'io.noties.markwon:ext-tables:4.2.0'
 }
 
 configurations {
diff --git a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
index b2e7de6..1d80af7 100644
--- a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
+++ b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
@@ -18,13 +18,12 @@ import com.github.gotify.Utils;
 import com.github.gotify.client.model.Message;
 import com.github.gotify.messages.provider.MessageWithImage;
 import com.squareup.picasso.Picasso;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.core.CorePlugin;
+import io.noties.markwon.ext.tables.TablePlugin;
+import io.noties.markwon.image.picasso.PicassoImagesPlugin;
+import io.noties.markwon.movement.MovementMethodPlugin;
 import java.util.List;
-import ru.noties.markwon.Markwon;
-import ru.noties.markwon.core.CorePlugin;
-import ru.noties.markwon.ext.tables.TablePlugin;
-import ru.noties.markwon.image.ImagesPlugin;
-import ru.noties.markwon.image.gif.GifPlugin;
-import ru.noties.markwon.movement.MovementMethodPlugin;
 
 public class ListMessageAdapter extends BaseAdapter {
 
@@ -52,9 +51,8 @@ public class ListMessageAdapter extends BaseAdapter {
                 Markwon.builder(context)
                         .usePlugin(CorePlugin.create())
                         .usePlugin(MovementMethodPlugin.create())
-                        .usePlugin(ImagesPlugin.create(context))
+                        .usePlugin(PicassoImagesPlugin.create(picasso))
                         .usePlugin(TablePlugin.create(context))
-                        .usePlugin(GifPlugin.create())
                         .build();
     }