diff --git a/app/build.gradle b/app/build.gradle
index cf0e376bd..69fad00e3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -125,6 +125,6 @@ dependencies {
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-2'
+   // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-2'
 
 }
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 bf8330dc9..7cab46f45 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
@@ -830,7 +830,9 @@ public class Status implements Parcelable{
                         key = key.split("\\|")[0];
                         SpannableStringBuilder ssb = new SpannableStringBuilder();
                         ssb.append(spannableStringT, 0, spannableStringT.length());
-                        ssb.replace(startPosition,endPosition, key);
+                        if( ssb.length() >= endPosition) {
+                            ssb.replace(startPosition,endPosition, key);
+                        }
                         spannableStringT = SpannableString.valueOf(ssb);
                         endPosition = startPosition + key.length();
                     }
@@ -881,7 +883,9 @@ public class Status implements Parcelable{
                         key = key.split("…")[0]+"…";
                         SpannableStringBuilder ssb = new SpannableStringBuilder();
                         ssb.append(spannableStringT, 0, spannableStringT.length());
-                        ssb.replace(startPosition,endPosition, key);
+                        if( ssb.length() >= endPosition) {
+                            ssb.replace(startPosition, endPosition, key);
+                        }
                         spannableStringT = SpannableString.valueOf(ssb);
                         endPosition = startPosition + key.length();
                     }