diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index a701f51b9..42e190d5c 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -975,7 +975,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
                 if (translator == Helper.TRANS_YANDEX)
                     aJsonString = yandexTranslateToText(translatedResult);
                 else if( translator == Helper.TRANS_GOOGLE)
-                    aJsonString = shortnameToUnicode(googleTranslateToText(translatedResult), true);
+                    aJsonString = googleTranslateToText(translatedResult);
                 if( aJsonString == null)
                     return;
                 Iterator itU = urlConversion.entrySet().iterator();
@@ -1027,6 +1027,16 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
         aJsonString = aJsonString.replace(" //","//");
         aJsonString = aJsonString.replace(" www .","www.");
         aJsonString = aJsonString.replace("www .","www.");
+
+        // This one might cause more trouble than it's worth
+        aJsonString = aJsonString.replaceAll("\\* \\.", "*.");
+
+        /*
+            Noticed that sometimes the special tags were getting messed up by Google,
+             might be other variants, only caught this one so far.
+         */
+        aJsonString = aJsonString.replaceAll("__ (u|t)(\\d+)__", "__$1$2__");
+
         aJsonString = URLDecoder.decode(aJsonString, "UTF-8");
         return aJsonString;
     }