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 aa8645351..6ec615c87 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
@@ -57,7 +57,6 @@ import java.util.regex.Pattern;
 
 import fr.gouv.etalab.mastodon.R;
 import fr.gouv.etalab.mastodon.activities.HashTagActivity;
-import fr.gouv.etalab.mastodon.activities.MainActivity;
 import fr.gouv.etalab.mastodon.activities.PeertubeActivity;
 import fr.gouv.etalab.mastodon.activities.ShowAccountActivity;
 import fr.gouv.etalab.mastodon.asynctasks.RetrieveFeedsAsyncTask;
@@ -65,9 +64,6 @@ import fr.gouv.etalab.mastodon.helper.CrossActions;
 import fr.gouv.etalab.mastodon.helper.Helper;
 import fr.gouv.etalab.mastodon.interfaces.OnRetrieveEmojiInterface;
 
-import static fr.gouv.etalab.mastodon.helper.Helper.INTENT_ACTION;
-import static fr.gouv.etalab.mastodon.helper.Helper.SEARCH_REMOTE;
-import static fr.gouv.etalab.mastodon.helper.Helper.SEARCH_URL;
 import static fr.gouv.etalab.mastodon.helper.Helper.THEME_BLACK;
 import static fr.gouv.etalab.mastodon.helper.Helper.THEME_DARK;
 import static fr.gouv.etalab.mastodon.helper.Helper.THEME_LIGHT;
@@ -879,10 +875,15 @@ public class Status implements Parcelable{
                                      Pattern link = Pattern.compile("https?:\\/\\/([\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/(@[\\w._-]*[0-9]*)(\\/[0-9]{1,})?$");
                                      Matcher matcherLink = link.matcher(url);
                                      if( matcherLink.find()){
-                                         Intent intent = new Intent(context, MainActivity.class);
-                                         intent.putExtra(INTENT_ACTION, SEARCH_REMOTE);
-                                         intent.putExtra(SEARCH_URL, url);
-                                         context.startActivity(intent);
+                                        if( matcherLink.group(3) != null && matcherLink.group(3).length() > 0 ){ //It's a toot
+                                            CrossActions.doCrossConversation(context, finalUrl);
+                                        }else{//It's an account
+                                            Account account = status.getAccount();
+                                            account.setAcct(matcherLink.group(2));
+                                            account.setInstance(matcherLink.group(1));
+                                            CrossActions.doCrossProfile(context, account);
+                                        }
+
                                      }else  {
                                          link = Pattern.compile("(https?:\\/\\/[\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/videos\\/watch\\/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
                                          matcherLink = link.matcher(url);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java
index bc77d85c2..eaf049068 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/CrossActions.java
@@ -326,6 +326,44 @@ public class CrossActions {
     }
 
 
+    public static void doCrossConversation(final Context context, String url){
+        SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
+        String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+        SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+        Account account = new AccountDAO(context, db).getAccountByID(userId);
+
+        new AsyncTask<Void, Void, Void>() {
+            private WeakReference<Context> contextReference = new WeakReference<>(context);
+            Results response;
+
+            @Override
+            protected void onPreExecute() {
+                Toasty.info(contextReference.get(), contextReference.get().getString(R.string.retrieve_remote_conversation), Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            protected Void doInBackground(Void... voids) {
+                API api = new API(contextReference.get(), account.getInstance(), account.getToken());
+                response = api.search(url);
+                return null;
+            }
+            @Override
+            protected void onPostExecute(Void result) {
+                if( response == null){
+                    return;
+                }
+                List<fr.gouv.etalab.mastodon.client.Entities.Status> statuses = response.getStatuses();
+                if( statuses != null && statuses.size() > 0) {
+                    Intent intent = new Intent(context, ShowConversationActivity.class);
+                    Bundle b = new Bundle();
+                    b.putParcelable("status", statuses.get(0));
+                    intent.putExtras(b);
+                    context.startActivity(intent);
+                }
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR );
+    }
+
     public static void doCrossBookmark(final Context context, final Status status, StatusListAdapter statusListAdapter ){
         List<Account> accounts = connectedAccounts(context, status, false);