diff --git a/website/client/src/components/chat/chatCard.vue b/website/client/src/components/chat/chatCard.vue
index 7329dd09c6..6a6163e851 100644
--- a/website/client/src/components/chat/chatCard.vue
+++ b/website/client/src/components/chat/chatCard.vue
@@ -34,6 +34,7 @@
       <div
         ref="markdownContainer"
         class="text markdown"
+        dir="auto"
         v-html="parseMarkdown(msg.text)"
       ></div>
       <hr>
@@ -164,7 +165,7 @@
     .text {
       font-size: 14px;
       color: #4e4a57;
-      text-align: left !important;
+      text-align: initial;
       min-height: 0rem;
     }
   }
diff --git a/website/client/src/components/groups/chat.vue b/website/client/src/components/groups/chat.vue
index 8990e5a39d..83e1482596 100644
--- a/website/client/src/components/groups/chat.vue
+++ b/website/client/src/components/groups/chat.vue
@@ -18,6 +18,7 @@
         <textarea
           ref="user-entry"
           v-model="newMessage"
+          dir="auto"
           :placeholder="placeholder"
           :class="{'user-entry': newMessage}"
           :maxlength="MAX_MESSAGE_LENGTH"
diff --git a/website/client/src/components/messages/messageCard.vue b/website/client/src/components/messages/messageCard.vue
index a6634f43d3..7c7d2581c0 100644
--- a/website/client/src/components/messages/messageCard.vue
+++ b/website/client/src/components/messages/messageCard.vue
@@ -21,6 +21,7 @@
     </p>
     <div
       class="text markdown"
+      dir="auto"
       v-html="parseMarkdown(msg.text)"
     ></div>
     <div
@@ -118,7 +119,7 @@
     .text {
       font-size: 14px;
       color: $gray-50;
-      text-align: left !important;
+      text-align: initial;
       min-height: 0rem;
     }
   }
diff --git a/website/client/src/pages/private-messages.vue b/website/client/src/pages/private-messages.vue
index f2f87d2a2b..ae50e32c2f 100644
--- a/website/client/src/pages/private-messages.vue
+++ b/website/client/src/pages/private-messages.vue
@@ -152,6 +152,7 @@
             <textarea
               ref="textarea"
               v-model="newMessage"
+              dir="auto"
               class="flex-fill"
               :placeholder="$t('needsTextPlaceholder')"
               :maxlength="MAX_MESSAGE_LENGTH"