diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index fed07a3e48..477cafa5d1 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -667,6 +667,7 @@ export class Message extends React.Component<Props, State> {
 
     return (
       <div
+        dir="auto"
         className={classNames(
           'module-message__text',
           `module-message__text--${direction}`,
diff --git a/ts/components/conversation/Quote.tsx b/ts/components/conversation/Quote.tsx
index 87be71200e..f24b4614d3 100644
--- a/ts/components/conversation/Quote.tsx
+++ b/ts/components/conversation/Quote.tsx
@@ -180,7 +180,7 @@ export class Quote extends React.Component<Props> {
 
     if (text) {
       return (
-        <div className="module-quote__primary__text">
+        <div dir="auto" className="module-quote__primary__text">
           <MessageBody text={text} i18n={i18n} />
         </div>
       );