diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index 7477e4e5f..49073bd63 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -165,7 +165,6 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
     private String initialContent;
     private final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 754;
     private BroadcastReceiver receive_picture;
-    private Bitmap pictureMention;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -292,11 +291,10 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
         }
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
-        ArrayList<String> mentionedAccountsAdded = new ArrayList<>();
         if( tootMention != null) {
             byte[] byteArray = getIntent().getByteArrayExtra("pictureMention");
             if (byteArray != null) {
-                pictureMention = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.length);
+                Bitmap pictureMention = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.length);
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
                 pictureMention.compress(Bitmap.CompressFormat.PNG, 0, bos);
                 byte[] bitmapdata = bos.toByteArray();
@@ -305,14 +303,8 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
                 toot_picture.setEnabled(false);
                 new UploadActionAsyncTask(getApplicationContext(), bs, TootActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
-            if( tootMention.getMentions() != null ){
-                for(Mention mention : tootMention.getMentions()){
-                    if(  mention.getAcct() != null && !mention.getId().equals(userId) && !mentionedAccountsAdded.contains(mention.getAcct())) {
-                        mentionedAccountsAdded.add(mention.getAcct());
-                        String tootTemp = String.format("@%s ", mention.getAcct());
-                        toot_content.setText(String.format("%s ", (toot_content.getText().toString() + " " + tootTemp)));
-                    }
-                }
+            if( tootMention.getAccount() != null && tootMention.getAccount().getAcct() != null && !tootMention.getAccount().getId().equals(userId)) {
+                toot_content.setText(String.format("\n\nvia @%s ", tootMention.getAccount().getAcct()));
             }
         }