diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 402c6db58d..c0a0155bdc 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -257,21 +257,28 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorBody" />
 
-    <TextView
-        android:id="@+id/tvBody"
+    <ScrollView
+        android:id="@+id/scroll"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
-        android:fontFamily="monospace"
-        android:scrollbars="vertical"
-        android:text="Body"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textIsSelectable="true"
+        android:fillViewport="true"
+        android:orientation="vertical"
         app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnImages" />
+        app:layout_constraintTop_toBottomOf="@id/btnImages">
+
+        <TextView
+            android:id="@+id/tvBody"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fontFamily="monospace"
+            android:text="Body"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textIsSelectable="true" />
+    </ScrollView>
 
     <ProgressBar
         android:id="@+id/pbBody"
@@ -280,10 +287,10 @@
         android:layout_height="24dp"
         android:layout_marginStart="12dp"
         android:indeterminate="true"
-        app:layout_constraintBottom_toBottomOf="@id/tvBody"
+        app:layout_constraintBottom_toBottomOf="@id/scroll"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/tvBody" />
+        app:layout_constraintTop_toTopOf="@id/scroll" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
@@ -294,7 +301,7 @@
         android:src="@drawable/baseline_fullscreen_24"
         android:tint="@color/colorActionForeground"
         app:backgroundTint="?attr/colorAccent"
-        app:layout_constraintBottom_toBottomOf="@+id/tvBody"
+        app:layout_constraintBottom_toBottomOf="@+id/scroll"
         app:layout_constraintEnd_toEndOf="parent" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
@@ -350,5 +357,5 @@
         android:id="@+id/grpMessage"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:constraint_referenced_ids="tvBody" />
+        app:constraint_referenced_ids="scroll" />
 </androidx.constraintlayout.widget.ConstraintLayout>