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 79226716b..64c4062ca 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
@@ -733,14 +733,13 @@ public class Status implements Parcelable{
                     if( (mention.getUsername()+"@"+currentInstance).equals(acct+"@"+instance))
                         addAccount = false;
                 }
-                if( addAccount) {
-                    Account account = new Account();
-                    account.setAcct(acct);
-                    account.setInstance(instance);
-                    accountsMentionUnknown.add(account);
-                }
             }
-
+            if( addAccount) {
+                Account account = new Account();
+                account.setAcct(acct);
+                account.setInstance(instance);
+                accountsMentionUnknown.add(account);
+            }
         }
         aLink = Pattern.compile("(<\\s?a\\s?href=\"(https?:\\/\\/[\\da-z\\.-]+\\.[a-z\\.]{2,6}[\\/]?[^\"@(\\/tags\\/)]*)\"\\s?[^.]*<\\s?\\/\\s?a\\s?>)");
         matcherALink = aLink.matcher(spannableString.toString());
@@ -811,7 +810,6 @@ public class Status implements Parcelable{
                         Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
         }
 
-
         if( accountsMentionUnknown.size() > 0 ) {
             for(Account account: accountsMentionUnknown){
                 String targetedAccount = "@" + account.getAcct();
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 90e42494e..b9c472f9a 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -1989,13 +1989,10 @@ public class Helper {
         boolean disableGif = sharedpreferences.getBoolean(SET_DISABLE_GIF, false);
 
         if (context instanceof FragmentActivity) {
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && ((FragmentActivity) context).isDestroyed())
-            {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && ((FragmentActivity) context).isDestroyed()) {
                 return;
             }
         }
-
         if( !disableGif)
             Glide.with(imageView.getContext())
                 .load(url)
@@ -2006,22 +2003,7 @@ public class Helper {
                     .asBitmap()
                     .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10)))
                     .load(url)
-                    .listener(new RequestListener<Bitmap>(){
-                        @Override
-                        public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
-                            return false;
-                        }
-                        @Override
-                        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
-                            return false;
-                        }
-                    })
-                    .into(new SimpleTarget<Bitmap>() {
-                        @Override
-                        public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
-                            imageView.setImageBitmap(resource);
-                        }
-                    });
+                    .into(imageView);
     }
 
     /**