diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
index 4012b784a..5d10fdd72 100644
--- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
@@ -3065,9 +3065,7 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface,
                 int matchEnd = matcherALink.end();
                 final String url = content.substring(matcherALink.start(1), matcherALink.end(1));
                 if( matchEnd <= content.length() && matchEnd >= matchStart){
-                    if( url.length() > 23){
-                        content = content.replaceFirst(url,"abcdefghijklmnopkrstuvw");
-                    }
+                    content = content.replaceFirst(url,"abcdefghijklmnopkrstuvw");
                 }
             }
         }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
index b2344f816..eca1acad4 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
@@ -560,11 +560,10 @@ public class Status implements Parcelable{
         
         Pattern aLink = Pattern.compile("<a href=\"([^\"]*)\"[^>]*(((?!<\\/a).)*)<\\/a>");
         Matcher matcherALink = aLink.matcher(content);
-
         while (matcherALink.find()){
             String beforemodification;
             String urlText = matcherALink.group(2);
-            //urlText += content.substring(matcherALink.start(3), matcherALink.end(3));
+
             urlText = urlText.substring(1);
             beforemodification = urlText;
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
@@ -578,7 +577,7 @@ public class Status implements Parcelable{
                     urlText += '…';
                 }
             }
-            content = content.replaceAll(beforemodification,urlText);
+            content = content.replaceAll(Pattern.quote(beforemodification),urlText);
         }
         spannableStringContent = new SpannableString(content);
         String spoilerText = "";