diff --git a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
index 6cb8fbd97..b345b7ccd 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
@@ -222,8 +222,13 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
 
                     View v;
                     if (FileUtils.isExtensionImage(filePath)) {
-                        v = content.findViewById(R.id.image);
-                        loadBitmap(c.getFilePath(), ((ImageView)v));
+                        if (fileContents.size() == 1 && mContext.getResources().getBoolean(R.bool.use_big_pictures_to_preview_images_file_transfers)) {
+                            v = content.findViewById(R.id.bigImage);
+                            loadBitmap(c.getFilePath(), ((ImageView) v));
+                        } else {
+                            v = content.findViewById(R.id.image);
+                            loadBitmap(c.getFilePath(), ((ImageView) v));
+                        }
                     } else {
                         v = content.findViewById(R.id.file);
                         ((TextView)v).setText(FileUtils.getNameFromFilePath(filePath));
diff --git a/app/src/main/res/layout/chat_bubble_content.xml b/app/src/main/res/layout/chat_bubble_content.xml
index 413143e9f..98af1ccd9 100644
--- a/app/src/main/res/layout/chat_bubble_content.xml
+++ b/app/src/main/res/layout/chat_bubble_content.xml
@@ -11,6 +11,14 @@
         android:layout_height="100dp"
         android:layout_margin="5dp"/>
 
+    <ImageView
+        android:id="@+id/bigImage"
+        android:visibility="gone"
+        android:adjustViewBounds="true"
+        android:layout_width="wrap_content"
+        android:layout_height="300dp"
+        android:layout_margin="5dp"/>
+
     <TextView
         android:id="@+id/file"
         android:visibility="gone"
diff --git a/app/src/main/res/values/non_localizable_custom.xml b/app/src/main/res/values/non_localizable_custom.xml
index ab23ac960..691c6dd29 100644
--- a/app/src/main/res/values/non_localizable_custom.xml
+++ b/app/src/main/res/values/non_localizable_custom.xml
@@ -91,6 +91,7 @@
     <bool name="allow_multiple_images_and_text">true</bool>
     <bool name="send_text_and_images_as_different_messages">true</bool>
     <bool name="use_new_chat_bubbles_layout">true</bool>
+    <bool name="use_big_pictures_to_preview_images_file_transfers">true</bool>
 
     <!-- Contacts -->
     <bool name="hide_contact_phone_numbers">false</bool>