diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 2494d081d..8edcf8014 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -1669,30 +1669,27 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                         Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
                     }
                 });
-                holder.fetch_more.setOnLongClickListener(new View.OnLongClickListener() {
-                    @Override
-                    public boolean onLongClick(View v) {
-                        status.setFetchMore(false);
-                        holder.fetch_more.setEnabled(false);
-                        holder.fetch_more.setVisibility(View.GONE);
-                        if (context instanceof BaseMainActivity) {
-                            SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-                            List<ManageTimelines> timelines = new TimelinesDAO(context, db).getDisplayedTimelines();
-                            for (ManageTimelines tl : timelines) {
-                                if (tl.getType() == ManageTimelines.Type.HOME && mPageReferenceMap != null) {
-                                    DisplayStatusFragment homeFragment = (DisplayStatusFragment) mPageReferenceMap.get(tl.getPosition());
-                                    if (homeFragment != null) {
-                                        fetch_all_more = true;
-                                        homeFragment.fetchMore(status.getId());
-                                    }
-                                    break;
+                holder.fetch_more.setOnLongClickListener(v -> {
+                    status.setFetchMore(false);
+                    holder.fetch_more.setEnabled(false);
+                    holder.fetch_more.setVisibility(View.GONE);
+                    if (context instanceof BaseMainActivity) {
+                        SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+                        List<ManageTimelines> timelines = new TimelinesDAO(context, db).getDisplayedTimelines();
+                        for (ManageTimelines tl : timelines) {
+                            if (tl.getType() == ManageTimelines.Type.HOME && mPageReferenceMap != null) {
+                                DisplayStatusFragment homeFragment = (DisplayStatusFragment) mPageReferenceMap.get(tl.getPosition());
+                                if (homeFragment != null) {
+                                    fetch_all_more = true;
+                                    homeFragment.fetchMore(status.getId());
                                 }
+                                break;
                             }
-                        } else {
-                            Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
                         }
-                        return false;
+                    } else {
+                        Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
                     }
+                    return false;
                 });
             } else {
                 holder.fetch_more.setVisibility(View.GONE);
@@ -3402,7 +3399,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 });
                 boolean long_press_media = sharedpreferences.getBoolean(Helper.SET_LONG_PRESS_MEDIA, true);
                 if (long_press_media) {
-                    String finalUrl = url;
+                    String finalUrl;
+                    if( attachment.getUrl() == null ){
+                        finalUrl = attachment.getRemote_url();
+                    }else{
+                        finalUrl = attachment.getUrl();
+                    }
                     imageView.setOnLongClickListener(v -> {
                         Helper.manageMove(context, finalUrl, false);
                         return true;