diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index 8a88467a1..8c5f905f9 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
     android:paddingRight="6dip"
     android:gravity="center_vertical" >
 
@@ -13,6 +14,34 @@
         android:layout_centerVertical="true"
         android:layout_alignParentLeft="true" />
 
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        android:paddingLeft="6dip" >
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/email"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    </LinearLayout>
+
     <RelativeLayout
         android:id="@+id/active_icons"
         android:layout_width="wrap_content"
@@ -65,33 +94,4 @@
 
     </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_toLeftOf="@+id/active_icons"
-        android:layout_toRightOf="@+id/chip"
-        android:orientation="vertical"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dip" >
-
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:id="@+id/email"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    </LinearLayout>
-
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 39c739e71..200d4e287 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    android:orientation="horizontal"
     android:paddingRight="1dip"
     android:paddingTop="2dip"
+    android:gravity="center_vertical"
     android:background="#ccc" >
 
-	<!--
-	  TODO: find a way to make the chip use the full height of the
-	  parent view with the height of the parent set to "wrap_content" 
-    -->
     <RelativeLayout
         android:id="@+id/chip"
         android:layout_width="wrap_content"
@@ -37,6 +35,55 @@
 
     </RelativeLayout>
     
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingLeft="6dip" >
+
+        <TextView
+            android:id="@+id/subject"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="1dip"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:id="@+id/from"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingLeft="2dip"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right|bottom"
+                android:paddingRight="5dip"
+                android:paddingLeft="5dip"
+                android:singleLine="true"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+    
     <CheckBox
         android:id="@+id/flagged"
         android:layout_height="20dip"
@@ -48,47 +95,4 @@
         android:button="@drawable/star"
         android:focusable="false" />
 
-    <TextView
-        android:id="@+id/subject"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/flagged"
-        android:layout_toRightOf="@+id/chip"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_marginRight="1dip"
-        android:paddingLeft="10dip"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    <TextView
-        android:id="@+id/date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/subject"
-        android:layout_toLeftOf="@+id/flagged"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_alignParentBottom="true"
-        android:gravity="right|bottom"
-        android:paddingRight="5dip"
-        android:paddingLeft="5dip"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    <TextView
-        android:id="@+id/from"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/subject"
-        android:layout_toLeftOf="@+id/date"
-        android:layout_toRightOf="@+id/chip"
-        android:layout_alignParentBottom="true"
-        android:paddingLeft="12dip"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-</RelativeLayout>
+</LinearLayout>