diff --git a/res/layout-sw533dp-land/avatar.xml b/res/layout-sw533dp-land/avatar.xml
deleted file mode 100644
index 361ea0b10..000000000
--- a/res/layout-sw533dp-land/avatar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:linphone="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="150dp"
-    android:orientation="horizontal" >
-    
-    <ImageView
-        android:layout_width="50dp"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        android:src="@drawable/avatar_shadow_left" />
-	
-    <ImageView
-        android:id="@+id/picture"
-        android:layout_width="150dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:contentDescription="@string/content_description_contact_picture"
-        android:scaleType="fitEnd"
-        android:src="@drawable/unknown_small" />
-    
-    <ImageView
-        android:layout_width="50dp"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        android:src="@drawable/avatar_shadow_right" />
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chat_bubble_alt_incoming.xml b/res/layout/chat_bubble_alt_incoming.xml
index 2369f271a..8a9566178 100644
--- a/res/layout/chat_bubble_alt_incoming.xml
+++ b/res/layout/chat_bubble_alt_incoming.xml
@@ -17,7 +17,9 @@
         android:adjustViewBounds="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" 
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:maxWidth="250dp"
+        android:maxHeight="250dp" />
     
     <Button
         android:id="@+id/download"
diff --git a/res/layout/chat_bubble_alt_outgoing.xml b/res/layout/chat_bubble_alt_outgoing.xml
index 880edf6e5..8f7f53d36 100644
--- a/res/layout/chat_bubble_alt_outgoing.xml
+++ b/res/layout/chat_bubble_alt_outgoing.xml
@@ -35,7 +35,9 @@
         android:id="@+id/image"
         android:adjustViewBounds="true"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:maxWidth="250dp"
+        android:maxHeight="250dp" />
     
     <Button
         android:id="@+id/download"
diff --git a/res/layout/chat_bubble_incoming.xml b/res/layout/chat_bubble_incoming.xml
index 7b31a49ae..b0e5f9441 100644
--- a/res/layout/chat_bubble_incoming.xml
+++ b/res/layout/chat_bubble_incoming.xml
@@ -17,7 +17,9 @@
         android:id="@+id/image"
         android:adjustViewBounds="true"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:maxWidth="250dp"
+        android:maxHeight="250dp" />
     
     <Button
         android:id="@+id/download"
diff --git a/res/layout/chat_bubble_outgoing.xml b/res/layout/chat_bubble_outgoing.xml
index ac3d377c8..cd60be3d9 100644
--- a/res/layout/chat_bubble_outgoing.xml
+++ b/res/layout/chat_bubble_outgoing.xml
@@ -19,7 +19,9 @@
         android:id="@+id/image"
         android:adjustViewBounds="true"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:maxWidth="250dp"
+        android:maxHeight="250dp" />
     
     <Button
         android:id="@+id/download"