diff --git a/src/cheogram/res/layout/link_description.xml b/src/cheogram/res/layout/link_description.xml
index 5934e8b1e68a6cf605f3575fe28fe73cc7b271ab..59c9c8814aacbf425f81321146d839e2c429efcd 100644
--- a/src/cheogram/res/layout/link_description.xml
+++ b/src/cheogram/res/layout/link_description.xml
@@ -2,37 +2,57 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="10dp"
+        android:paddingHorizontal="4dp"
         android:paddingVertical="4dp"
-        android:background="@drawable/background_link_description"
-        android:orientation="vertical">
+        android:descendantFocusability="blocksDescendants"
+        android:background="@drawable/background_link_description">
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textColor="?colorPrimary"
-            android:textAppearance="?textAppearanceTitleSmall" />
+            android:paddingHorizontal="6dp"
+            android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/url"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textColor="?colorOnSurface"
-            android:textAppearance="?textAppearanceLabelSmall" />
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:textColor="?colorPrimary"
+                android:textAppearance="?textAppearanceTitleSmall" />
+
+            <TextView
+                android:id="@+id/url"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:textColor="?colorOnSurface"
+                android:textAppearance="?textAppearanceLabelSmall" />
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?colorOnSurface"
+                android:textAppearance="?textAppearanceBodyMedium" />
+
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/description"
+        <ImageButton
+            android:id="@+id/play_button"
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?colorOnSurface"
-            android:textAppearance="?textAppearanceBodyMedium" />
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_play_circle_24dp" />
 
-    </LinearLayout>
+    </RelativeLayout>
 
 </layout>
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 7dc9fc8fb834871ec2140f71eaa2b62559199bd9..c3f87557655d0c71d8dc4d8ca59084985fe3dd65 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1552,6 +1552,13 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                         binding.title.setText(getItem(position).findChildContent("title", "https://ogp.me/ns#"));
                         binding.description.setText(getItem(position).findChildContent("description", "https://ogp.me/ns#"));
                         binding.url.setText(getItem(position).findChildContent("url", "https://ogp.me/ns#"));
+                        final var video = getItem(position).findChildContent("video", "https://ogp.me/ns#");
+                        if (video != null && video.length() > 0) {
+                            binding.playButton.setVisibility(View.VISIBLE);
+                            binding.playButton.setOnClickListener((v) -> {
+                                new FixedURLSpan(video).onClick(v);
+                            });
+                        }
                         return binding.getRoot();
                     }
                 });