diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 1b4bd8659e..526bc39efd 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -45,7 +45,7 @@
             <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/mms_view"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:paddingTop="7dip"
                 android:paddingBottom="7dip">
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index ec1f6c021a..3f259ec4f8 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -59,6 +59,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:linksClickable="true"
+                android:paddingTop="5dip"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:gravity="right"
                 android:textColor="?conversation_text_primary_color"
@@ -67,7 +68,7 @@
             <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/mms_view"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_height="wrap_content"
                 android:visibility="gone"
                 android:paddingTop="7dip"
                 android:paddingBottom="7dip">