Merge branch 'glitch' into production

1 files changed, 1 insertions, 2 deletions

diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index d85a333b3..4fa053744 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -115,8 +115,7 @@ class Formatter
   end
 
   def format_field(account, str, **options)
-    return reformat(str).html_safe unless account.local? # rubocop:disable Rails/OutputSafety
-    html = encode_and_link_urls(str, me: true)
+    html = account.local? ? encode_and_link_urls(str, me: true) : reformat(str)
     html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
     html.html_safe # rubocop:disable Rails/OutputSafety
   end