diff --git a/app/build.gradle b/app/build.gradle
index e320472..8fabc96 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,6 +49,7 @@ 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'
 }
 
 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 20029d9..f0645de 100644
--- a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
+++ b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
@@ -18,6 +18,8 @@ import com.github.gotify.client.model.Message;
 import com.github.gotify.messages.provider.MessageWithImage;
 import com.squareup.picasso.Picasso;
 import java.util.List;
+import ru.noties.markwon.Markwon;
+import ru.noties.markwon.core.CorePlugin;
 
 public class ListMessageAdapter extends BaseAdapter {
 
@@ -26,6 +28,7 @@ public class ListMessageAdapter extends BaseAdapter {
     private List<MessageWithImage> items;
     private Delete delete;
     private Settings settings;
+    private Markwon markwon;
 
     ListMessageAdapter(
             Context context,
@@ -39,6 +42,7 @@ public class ListMessageAdapter extends BaseAdapter {
         this.picasso = picasso;
         this.items = items;
         this.delete = delete;
+        this.markwon = Markwon.builder(context).usePlugin(CorePlugin.create()).build();
     }
 
     void items(List<MessageWithImage> items) {
@@ -70,7 +74,7 @@ public class ListMessageAdapter extends BaseAdapter {
         }
         ViewHolder holder = new ViewHolder(view);
         final MessageWithImage message = items.get(position);
-        holder.message.setText(message.message.getMessage());
+        markwon.setMarkdown(holder.message, message.message.getMessage());
         holder.title.setText(message.message.getTitle());
         picasso.load(Utils.resolveAbsoluteUrl(settings.url() + "/", message.image))
                 .error(R.drawable.ic_alarm)