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 60329bd24..5e6b7846e 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -1027,6 +1027,28 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             //Click on a conversation
 
             if ((getItemViewType(viewHolder.getAdapterPosition()) == DISPLAYED_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == COMPACT_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == CONSOLE_STATUS)) {
+                holder.status_spoiler_container.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE) {
+                            Intent intent = new Intent(context, ShowConversationActivity.class);
+                            Bundle b = new Bundle();
+                            if( social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
+                                b.putString("conversationId", status.getConversationId());
+                            if (status.getReblog() == null)
+                                b.putParcelable("status", status);
+                            else
+                                b.putParcelable("status", status.getReblog());
+                            intent.putExtras(b);
+                            if (type == RetrieveFeedsAsyncTask.Type.CONTEXT)
+                                ((Activity) context).finish();
+                            context.startActivity(intent);
+                        } else {
+                            if (social != UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE)
+                                CrossActions.doCrossConversation(context, status);
+                        }
+                    }
+                });
                 holder.status_content.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {