4 files changed, 29 insertions, 29 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 09d0573b..db92c05f 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -18,9 +18,6 @@
         android:listSelector="@android:color/transparent"
         android:stackFromBottom="true"
         android:transcriptMode="normal"
-        android:paddingTop="@dimen/activity_horizontal_margin"
-        android:paddingBottom="@dimen/activity_horizontal_margin"
-        android:clipToPadding="false"
         tools:listitem="@layout/message_sent">
     </ListView>
 
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 785e5b96..4de9addd 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -3,19 +3,17 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="0dp"
-    android:paddingLeft="@dimen/activity_vertical_margin"
-    android:paddingRight="4dp"
-    android:paddingTop="0dp">
+    android:paddingBottom="3dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="3dp">
 
     <ImageView
         android:id="@+id/message_photo"
-        android:layout_width="36dp"
-        android:layout_height="38dp"
-        android:paddingTop="2dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="@dimen/message_profile_image_gap"
         android:scaleType="fitXY"
         android:src="@drawable/ic_profile" />
 
@@ -26,14 +24,17 @@
         android:layout_alignParentBottom="true"
         android:layout_toRightOf="@+id/message_photo"
         android:background="@drawable/message_bubble_received"
-        android:minHeight="48dp"
+        android:minHeight="53dp"
+        android:layout_marginTop="-2dp"
+        android:layout_marginRight="-4dp"
         android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="2dp">
 
             <ImageView
                 android:id="@+id/message_image"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 15969d82..96e7808f 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -3,21 +3,21 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="0dp"
-    android:paddingLeft="4dp"
-    android:paddingRight="@dimen/activity_vertical_margin"
-    android:paddingTop="0dp">
+    android:paddingBottom="3dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="3dp">
 
     <ImageView
         android:id="@+id/message_photo"
-        android:layout_width="36dp"
-        android:layout_height="40dp"
-        android:paddingBottom="4dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:paddingBottom="3dp"
+        android:src="@drawable/ic_profile"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:layout_marginLeft="@dimen/message_profile_image_gap"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_profile" />
+        android:layout_alignParentEnd="true"/>
 
     <LinearLayout
         android:id="@+id/message_box"
@@ -26,14 +26,16 @@
         android:layout_alignParentBottom="true"
         android:layout_toLeftOf="@+id/message_photo"
         android:background="@drawable/message_bubble_sent"
-        android:minHeight="48dp"
+        android:minHeight="53dp"
+        android:layout_marginLeft="-4dp"
         android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="2dp">
 
             <ImageView
                 android:id="@+id/message_image"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 99a09527..222e23f5 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -3,15 +3,15 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="2dp"
+    android:paddingBottom="5dp"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:paddingTop="2dp" >
+    android:paddingTop="5dp" >
 
     <ImageView
         android:id="@+id/message_photo"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="-1.5dp"