diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index 22ce030a4..edc8c69e4 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -120,7 +120,7 @@
                     <ImageView
                         android:id="@+id/image"
                         android:layout_width="150dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="150dp"
                         android:layout_below="@id/file_name"
                         android:layout_centerHorizontal="true"
                         android:scaleType="centerInside"/>
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 8fdce67cc..019418f13 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -570,10 +570,6 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
 				final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
 				if (this == bitmapWorkerTask && imageView != null) {
 					imageView.setImageBitmap(bitmap);
-
-					//Force scroll too bottom with setSelection() after image loaded and last messages
-					mFragment.scrollToBottom();
-
 					imageView.setTag(path);
 					imageView.setOnClickListener(new View.OnClickListener() {
 						@Override