diff --git a/message/templates/message_drawer_view_conversation_body_message.mustache b/message/templates/message_drawer_view_conversation_body_message.mustache
index 5bfca2d0eb9..bd3c2c2034e 100644
--- a/message/templates/message_drawer_view_conversation_body_message.mustache
+++ b/message/templates/message_drawer_view_conversation_body_message.mustache
@@ -66,5 +66,5 @@
         <span class="hidden ml-2 small text-dark" data-region="not-selected-icon">{{#pix}} i/uncheckedcircle, core {{/pix}}</span>
         <span class="hidden ml-2 small text-primary" data-region="selected-icon">{{#pix}} i/checkedcircle, core {{/pix}}</span>
     </div>
-    <div>{{{text}}}</div>
+    <div dir="auto" align="initial">{{{text}}}</div>
 </div>
\ No newline at end of file
diff --git a/message/templates/message_drawer_view_conversation_footer_content.mustache b/message/templates/message_drawer_view_conversation_footer_content.mustache
index a26501dc9b4..2d5f48818e3 100644
--- a/message/templates/message_drawer_view_conversation_footer_content.mustache
+++ b/message/templates/message_drawer_view_conversation_footer_content.mustache
@@ -37,6 +37,7 @@
 
 <div class="d-flex mt-1">
     <textarea
+        dir="auto"
         data-region="send-message-txt"
         class="form-control bg-light"
         rows="3"
diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index 28055ecff20..99a47806e9f 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -469,6 +469,10 @@ $message-drawer-width: 320px;
     .footer-container {
         flex-shrink: 0;
         overflow-x: hidden;
+
+        textarea {
+            direction: ltr;
+        }
     }
 
     .matchtext {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 5853b529179..f7d6e704d32 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -13655,6 +13655,8 @@ a.ygtvspacer:hover {
   .message-app .footer-container {
     flex-shrink: 0;
     overflow-x: hidden; }
+    .message-app .footer-container textarea {
+      direction: ltr; }
   .message-app .matchtext {
     background-color: #b5d9f9;
     color: #373a3c;
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index 6ab7c1b4c04..5cff5142f06 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -484,6 +484,10 @@
     .footer-container {
         flex-shrink: 0;
         overflow-x: hidden;
+
+        textarea {
+            direction: ltr;
+        }
     }
 
     .matchtext {
@@ -604,6 +608,12 @@
     }
 }
 
+.dir-rtl {
+    .message-drawer {
+        box-shadow: 2px 2px 4px rgba(0, 0, 0, .08);
+    }
+}
+
 @media (max-width: 480px) {
     .messaging-area-container {
         .messaging-area {
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index dc275e05e99..74616fe18a1 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -8555,6 +8555,9 @@ a.ygtvspacer:hover {
   flex-shrink: 0;
   overflow-x: hidden;
 }
+.message-app .footer-container textarea {
+  direction: ltr;
+}
 .message-app .matchtext {
   background-color: #ade6fe;
   color: #333;
@@ -8644,6 +8647,9 @@ a.ygtvspacer:hover {
 .message-app .lazy-load-list {
   overflow-y: auto;
 }
+.dir-rtl .message-drawer {
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.08);
+}
 @media (max-width: 480px) {
   .messaging-area-container .messaging-area .messages-area.editing .messages-header {
     height: 80px;
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
index a8173b65341..f6ee0e177d1 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
@@ -70,5 +70,5 @@
         <span class="hidden ml-2 small text-primary" data-region="not-selected-icon">{{#pix}} i/uncheckedcircle, core {{/pix}}</span>
         <span class="hidden ml-2 small text-primary" data-region="selected-icon">{{#pix}} i/checkedcircle, core {{/pix}}</span>
     </div>
-    <div>{{{text}}}</div>
+    <div dir="auto" align="initial">{{{text}}}</div>
 </div>
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_content.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_content.mustache
index 191547c269f..9ab6af0fa04 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_content.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_content.mustache
@@ -40,6 +40,7 @@
 
 <div class="d-flex mt-1">
     <textarea
+        dir="auto"
         data-region="send-message-txt"
         class="form-control bg-light m-0 flex-grow"
         rows="3"