diff --git a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
index 59c0ee4b7..5c59fa274 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
@@ -82,6 +82,7 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
     private final RelativeLayout singleFileContent;
 
     public final CheckBox delete;
+    public boolean isEditionEnabled;
 
     private Context mContext;
     private ChatMessageViewHolderClickListener mListener;
@@ -275,7 +276,11 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
                     new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            openFile(filePath);
+                            if (isEditionEnabled) {
+                                ChatMessageViewHolder.this.onClick(v);
+                            } else {
+                                openFile(filePath);
+                            }
                         }
                     });
         } else {
@@ -315,11 +320,15 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
                         new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                Content c = (Content) v.getTag();
-                                if (!message.isFileTransferInProgress()) {
-                                    message.downloadContent(c);
+                                if (isEditionEnabled) {
+                                    ChatMessageViewHolder.this.onClick(v);
                                 } else {
-                                    message.cancelFileTransfer();
+                                    Content c = (Content) v.getTag();
+                                    if (!message.isFileTransferInProgress()) {
+                                        message.downloadContent(c);
+                                    } else {
+                                        message.cancelFileTransfer();
+                                    }
                                 }
                             }
                         });
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
index 7fc4e7718..c4d5ff848 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
@@ -119,6 +119,7 @@ public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder
         holder.bubbleLayout.setVisibility(View.GONE);
         holder.sendInProgress.setVisibility(View.GONE);
 
+        holder.isEditionEnabled = isEditionEnabled();
         if (isEditionEnabled()) {
             holder.delete.setVisibility(View.VISIBLE);
             holder.delete.setChecked(isSelected(position));