diff --git a/languages.py b/languages.py
index 621c94c72..2a2ed4869 100644
--- a/languages.py
+++ b/languages.py
@@ -302,17 +302,20 @@ def auto_translate_post(base_dir: str, post_json_object: {},
     lang_list = \
         libretranslate_languages(libretranslate_url, libretranslate_api_key)
     for lang in lang_list:
+        content = None
         if msg_object['contentMap'].get(lang):
             content = msg_object['contentMap'][lang]
+        if not content:
+            continue
+        translated_text = \
+            libretranslate(libretranslate_url, content,
+                           lang, system_language,
+                           libretranslate_api_key)
+        if translated_text:
+            if remove_html(translated_text) == remove_html(content):
+                return content
             translated_text = \
-                libretranslate(libretranslate_url, content,
-                               lang, system_language,
-                               libretranslate_api_key)
-            if translated_text:
-                if remove_html(translated_text) == remove_html(content):
-                    return content
-                translated_text = \
-                    '<p>' + translate['Translated'].upper() + '</p>' + \
-                    translated_text
-            return translated_text
+                '<p>' + translate['Translated'].upper() + '</p>' + \
+                translated_text
+        return translated_text
     return ''
diff --git a/webapp_post.py b/webapp_post.py
index a766e786c..a84fddf9c 100644
--- a/webapp_post.py
+++ b/webapp_post.py
@@ -2055,6 +2055,9 @@ def individual_post_as_html(signing_priv_key_pem: str,
 
     if not is_pgp_encrypted(content_str):
         if not is_patch:
+            # remove any tabs
+            content_str = \
+                content_str.replace('\t', '').replace('\r', '')
             # Add bold text
             if bold_reading and \
                not displaying_ciphertext and \