diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
index 35b98ef71..a1930da8d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
@@ -21,6 +21,7 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.text.method.ScrollingMovementMethod
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
@@ -79,6 +80,7 @@ class ViewVideoFragment : ViewMediaFragment() {
     ) {
         binding.mediaDescription.text = description
         binding.mediaDescription.visible(showingDescription)
+        binding.mediaDescription.movementMethod = ScrollingMovementMethod()
 
         binding.videoView.transitionName = url
         binding.videoView.setVideoPath(url)
@@ -125,7 +127,10 @@ class ViewVideoFragment : ViewMediaFragment() {
             val videoWidth = mp.videoWidth.toFloat()
             val videoHeight = mp.videoHeight.toFloat()
 
-            if (containerWidth / containerHeight > videoWidth / videoHeight) {
+            if (isAudio) {
+                binding.videoView.layoutParams.height = 1
+                binding.videoView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            } else if (containerWidth / containerHeight > videoWidth / videoHeight) {
                 binding.videoView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
                 binding.videoView.layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT
             } else {
diff --git a/app/src/main/res/layout/fragment_view_video.xml b/app/src/main/res/layout/fragment_view_video.xml
index 180481c45..291361371 100644
--- a/app/src/main/res/layout/fragment_view_video.xml
+++ b/app/src/main/res/layout/fragment_view_video.xml
@@ -20,6 +20,7 @@
         android:textAlignment="center"
         android:textColor="#eee"
         android:textSize="?attr/status_text_medium"
+        android:scrollbars="vertical"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Some media description" />
 
diff --git a/app/src/main/res/layout/item_media_preview.xml b/app/src/main/res/layout/item_media_preview.xml
index 27b58e7a1..3d89335fc 100644
--- a/app/src/main/res/layout/item_media_preview.xml
+++ b/app/src/main/res/layout/item_media_preview.xml
@@ -141,6 +141,8 @@
             android:importantForAccessibility="no"
             android:textSize="?attr/status_text_medium"
             android:visibility="gone"
+            android:maxLines="10"
+            android:ellipsize="end"
             app:drawableTint="?android:attr/textColorTertiary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -155,6 +157,8 @@
             android:importantForAccessibility="no"
             android:textSize="?attr/status_text_medium"
             android:visibility="gone"
+            android:maxLines="10"
+            android:ellipsize="end"
             app:drawableTint="?android:attr/textColorTertiary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/status_media_label_0" />
@@ -169,6 +173,8 @@
             android:importantForAccessibility="no"
             android:textSize="?attr/status_text_medium"
             android:visibility="gone"
+            android:maxLines="10"
+            android:ellipsize="end"
             app:drawableTint="?android:attr/textColorTertiary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/status_media_label_1" />
@@ -183,6 +189,8 @@
             android:importantForAccessibility="no"
             android:textSize="?attr/status_text_medium"
             android:visibility="gone"
+            android:maxLines="10"
+            android:ellipsize="end"
             app:drawableTint="?android:attr/textColorTertiary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/status_media_label_2" />