diff --git a/res/layout/avatar.xml b/res/layout/avatar.xml
index fd202987e..4c486b70b 100644
--- a/res/layout/avatar.xml
+++ b/res/layout/avatar.xml
@@ -2,19 +2,19 @@
 <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="wrap_content"
+    android:layout_height="100dp"
     android:orientation="horizontal" >
     
     <ImageView
         android:layout_width="25dp"
-        android:layout_height="100dp"
+        android:layout_height="match_parent"
         android:scaleType="fitXY"
         android:src="@drawable/avatar_shadow_left" />
 	
     <ImageView
         android:id="@+id/picture"
         android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_height="match_parent"
         android:layout_gravity="center"
         android:contentDescription="@string/content_description_contact_picture"
         android:scaleType="fitEnd"
@@ -22,7 +22,7 @@
     
     <ImageView
         android:layout_width="25dp"
-        android:layout_height="100dp"
+        android:layout_height="match_parent"
         android:scaleType="fitXY"
         android:src="@drawable/avatar_shadow_right" />
     
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 03c9f49da..47791eaac 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -9,7 +9,7 @@
     <LinearLayout 
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
-	    android:paddingTop="20dp"
+	    android:paddingTop="10dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
 	    android:gravity="center"
@@ -18,7 +18,7 @@
         <org.linphone.ui.AvatarWithShadow
 		    android:id="@+id/contactPicture"
 		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
+		    android:layout_height="100dp"
 		    linphone:picture="@drawable/unknown_small" />
 	        
         <TextView