diff --git a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
index 9f17342ede..cf7e5698c0 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
@@ -38,6 +38,7 @@
         <item name="android:lines">1</item>
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:textSize">16sp</item>
+        <item name="android:textDirection">locale</item>
     </style>
 
     <style name="BottomSheetItemTextSecondary">
@@ -49,6 +50,7 @@
         <item name="android:maxLines">2</item>
         <item name="android:textColor">?vctr_content_secondary</item>
         <item name="android:textSize">14sp</item>
+        <item name="android:textDirection">locale</item>
     </style>
 
     <style name="BottomSheetItemTime">
diff --git a/library/ui-styles/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
index 89c5e08a60..34cdd01daa 100644
--- a/library/ui-styles/src/main/res/values/styles_text_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_text_view.xml
@@ -13,6 +13,7 @@
         <!--
         <item name="lineHeight">32sp</item>
         -->
+        <item name="android:textDirection">locale</item>
     </style>
 
     <style name="Widget.Vector.TextView.Title.Medium">
@@ -21,10 +22,12 @@
 
     <style name="Widget.Vector.TextView.HeadlineMedium">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
+        <item name="android:textDirection">locale</item>
     </style>
 
     <style name="Widget.Vector.TextView.Subtitle">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
+        <item name="android:textDirection">locale</item>
     </style>
 
     <style name="Widget.Vector.TextView.Subtitle.Medium">
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 9c79616589..15d7e5fc57 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -157,6 +157,7 @@
         <TextView
             android:id="@+id/itemNoticeTextView"
             style="@style/Widget.Vector.TextView.Body"
+            android:textDirection="locale"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index 8b024849cc..aa6836e0e6 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -18,6 +18,7 @@
     <TextView
         android:id="@+id/itemNoticeTextView"
         style="@style/Widget.Vector.TextView.Body"
+        android:textDirection="locale"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"