diff --git a/app/build.gradle b/app/build.gradle
index c2fa72ead..8aab05f90 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 149
-        versionName "1.15.0"
+        versionCode 150
+        versionName "1.15.1"
     }
     flavorDimensions "default"
     buildTypes {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
index 5d5c4b5f4..b99a437da 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
@@ -763,11 +763,9 @@ public class Status implements Parcelable{
             int matchStart = matcher.start(2);
             int matchEnd = matcher.end();
             final String twittername = matcher.group(2);
-            if( spannableStringT.length() < matchEnd) {
-                URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
-                for (URLSpan span : spans) {
-                    spannableStringT.removeSpan(span);
-                }
+            URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
+            for (URLSpan span : spans) {
+                spannableStringT.removeSpan(span);
             }
             if( matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)
                 spannableStringT.setSpan(new ClickableSpan() {
@@ -830,11 +828,9 @@ public class Status implements Parcelable{
                     for(int startPosition = -1 ; (startPosition = spannableStringT.toString().toLowerCase().indexOf(key.toLowerCase(), startPosition + 1)) != -1 ; startPosition++){
 
                         int endPosition = startPosition + key.length();
-                        if( spannableStringT.length() < endPosition) {
-                            URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
-                            for (URLSpan span : spans) {
-                                spannableStringT.removeSpan(span);
-                            }
+                        URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
+                        for (URLSpan span : spans) {
+                            spannableStringT.removeSpan(span);
                         }
                         if( endPosition <= spannableStringT.toString().length() && endPosition >= startPosition) {
                             spannableStringT.setSpan(new ClickableSpan() {
@@ -895,11 +891,9 @@ public class Status implements Parcelable{
                     for(int startPosition = -1 ; (startPosition = spannableStringT.toString().toLowerCase().indexOf(targetedAccount.toLowerCase(), startPosition + 1)) != -1 ; startPosition++){
 
                         int endPosition = startPosition + targetedAccount.length();
-                        if( spannableStringT.length() < endPosition) {
-                            URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
-                            for (URLSpan span : spans) {
-                                spannableStringT.removeSpan(span);
-                            }
+                        URLSpan[] spans = spannableStringT.getSpans(startPosition, endPosition, URLSpan.class);
+                        for (URLSpan span : spans) {
+                            spannableStringT.removeSpan(span);
                         }
                         if( endPosition <= spannableStringT.toString().length() && endPosition >= startPosition)
                             spannableStringT.setSpan(new ClickableSpan() {
@@ -931,11 +925,9 @@ public class Status implements Parcelable{
         while (matcher.find()){
             int matchStart = matcher.start(1);
             int matchEnd = matcher.end();
-            if( spannableStringT.length() < matchEnd) {
-                URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
-                for (URLSpan span : spans) {
-                    spannableStringT.removeSpan(span);
-                }
+            URLSpan[] spans = spannableStringT.getSpans(matchStart, matchEnd, URLSpan.class);
+            for (URLSpan span : spans) {
+                spannableStringT.removeSpan(span);
             }
             final String tag = spannableStringT.toString().substring(matchStart, matchEnd);
             if( matchEnd <= spannableStringT.toString().length() && matchEnd >= matchStart)