diff --git a/src/prefs_impl.nim b/src/prefs_impl.nim
index 21fec25095599f0d70480ca405b193bfd05ff1e3..448de5d3662dd4fb576d24992750fd3a6e8cf2ec 100644
--- a/src/prefs_impl.nim
+++ b/src/prefs_impl.nim
@@ -88,6 +88,9 @@ genPrefs:
     stickyProfile(checkbox, true):
       "Make profile sidebar stick to top"
 
+    bidiSupport(checkbox, false):
+      "Support bidirectional text (makes clicking on tweets harder)"
+
     hideTweetStats(checkbox, false):
       "Hide tweet stats (replies, retweets, likes)"
 
diff --git a/src/sass/tweet/_base.scss b/src/sass/tweet/_base.scss
index e9012a1628a48cc44bb54984956c39bcc71b9c6e..88416579154e37c041e7baae1c6709ec7d7f3c6d 100644
--- a/src/sass/tweet/_base.scss
+++ b/src/sass/tweet/_base.scss
@@ -20,6 +20,11 @@
     font-family: $font_3;
     line-height: 1.4em;
     pointer-events: all;
+    display: inline;
+}
+
+.tweet-bidi {
+    display: block !important;
 }
 
 .tweet-header {
diff --git a/src/views/tweet.nim b/src/views/tweet.nim
index 17bcd98d5962ff9ce48313a9da54f0aa534fb755..c5d973cb7a4077ade0356c346b6d225878792c74 100644
--- a/src/views/tweet.nim
+++ b/src/views/tweet.nim
@@ -299,7 +299,11 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class=""; index=0;
          (tweet.reply.len > 1 or tweet.reply[0] != tweet.profile.username):
         renderReply(tweet)
 
-      tdiv(class="tweet-content media-body", dir="auto"):
+      var tweetClass = "tweet-content media-body"
+      if prefs.bidiSupport:
+        tweetClass &= " tweet-bidi"
+
+      tdiv(class=tweetClass, dir="auto"):
         verbatim replaceUrl(tweet.text, prefs) & renderLocation(tweet)
 
       if tweet.attribution.isSome: