diff --git a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
index 7889efacc4..7fe8f6f1f0 100644
--- a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <HorizontalScrollView
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
-        <TextView
+        <im.vector.riotx.core.ui.views.WrapWidthTextView
             android:id="@+id/codeBlockTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
 
     </HorizontalScrollView>
 
-    <TextView
+    <im.vector.riotx.core.ui.views.WrapWidthTextView
         android:id="@+id/codeBlockEditedView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"