diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 8701ee08d..598eddae4 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -1398,7 +1398,6 @@ export class Message extends React.PureComponent<Props, State> {
 
     return (
       <div
-        dir="auto"
         className={classNames(
           'module-message__text',
           `module-message__text--${direction}`,
diff --git a/ts/components/conversation/MessageBody.tsx b/ts/components/conversation/MessageBody.tsx
index f6829f2df..b38e27253 100644
--- a/ts/components/conversation/MessageBody.tsx
+++ b/ts/components/conversation/MessageBody.tsx
@@ -104,7 +104,7 @@ export function MessageBody({
   };
 
   return (
-    <span>
+    <span dir="auto">
       {disableLinks ? (
         renderEmoji({
           i18n,