diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index 0588dd11..cd730a44 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -476,10 +476,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
             } else if (type.startsWith("image/") || type.startsWith("video/")) {
                 Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
                 if (imageUri != null) {
-                    intent = new Intent(BaseMainActivity.this, ComposeActivity.class);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-                    intent.putExtra(Helper.ARG_SHARE_URI, imageUri);
-                    startActivity(intent);
+                    Bundle b = new Bundle();
+                    b.putParcelable(Helper.ARG_SHARE_URI, imageUri);
+                    CrossActionHelper.doCrossShare(BaseMainActivity.this, b);
                 } else {
                     Toasty.warning(BaseMainActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
                 }
diff --git a/app/src/main/java/app/fedilab/android/client/entities/app/Account.java b/app/src/main/java/app/fedilab/android/client/entities/app/Account.java
index 046bc5c7..7410dc45 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/app/Account.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/app/Account.java
@@ -361,7 +361,6 @@ public class Account extends BaseAccount implements Serializable {
         List<BaseAccount> accountList = new ArrayList<>();
         while (c.moveToNext()) {
             BaseAccount account = convertCursorToAccount(c);
-            //We don't add in the list the current connected account
             accountList.add(account);
         }
         //Close the cursor