diff --git a/app/src/main/res/layout/listitem_email.xml b/app/src/main/res/layout/listitem_email.xml
index 19280e5..ac8a2a6 100644
--- a/app/src/main/res/layout/listitem_email.xml
+++ b/app/src/main/res/layout/listitem_email.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/listitem_checked"
-    android:padding="5dp" >
+    android:layout_height="@dimen/listitem_height"
+    android:background="@drawable/listitem_checked">
 
     <ImageView
         android:id="@+id/contact_picture"
-        android:layout_width="54dp"
-        android:layout_height="54dp"
+        android:layout_width="@dimen/listitem_picture_size"
+        android:layout_height="@dimen/listitem_picture_size"
+        android:layout_alignTop="@+id/email_subject"
+        android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+        android:layout_marginStart="@dimen/listitem_horizontal_margin"
+        android:layout_marginTop="4dp"
         android:scaleType="centerCrop"
         android:src="@drawable/ic_contact_picture" />
 
@@ -18,70 +21,90 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/contact_picture"
         android:layout_alignLeft="@+id/contact_picture"
-        android:visibility="gone"
-        android:src="@drawable/ic_navigation_accept" />
+        android:layout_alignStart="@+id/contact_picture"
+        android:src="@drawable/ic_navigation_accept"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/email_subject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/contact_picture"
-        android:layout_marginLeft="5dp"
-        android:layout_toRightOf="@+id/contact_picture"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="@dimen/listitem_text_left_margin"
+        android:layout_marginStart="@dimen/listitem_text_left_margin"
+        android:layout_marginTop="12dp"
+        android:layout_toLeftOf="@+id/email_attachment"
         android:layout_toStartOf="@+id/email_attachment"
         android:ellipsize="end"
         android:maxLines="1"
         android:text="Email subject"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@+id/email_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/email_address"
-        android:layout_below="@+id/email_subject"
-        android:layout_toStartOf="@+id/email_status"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="Content" />
+        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
     <TextView
         android:id="@+id/email_address"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/email_subject"
-        android:layout_below="@+id/email_content"
+        android:layout_alignStart="@+id/email_subject"
+        android:layout_below="@+id/email_subject"
+        android:layout_toLeftOf="@+id/email_sent"
         android:layout_toStartOf="@+id/email_sent"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="From" />
+        android:text="From"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    <TextView
+        android:id="@+id/email_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/email_subject"
+        android:layout_alignStart="@+id/email_subject"
+        android:layout_below="@+id/email_address"
+        android:layout_toLeftOf="@+id/email_status"
+        android:layout_toStartOf="@+id/email_status"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="Content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textColor="@color/secondary_text_default_material_light" />
 
     <ImageView
         android:id="@+id/email_attachment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/email_subject"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
         android:layout_alignBottom="@+id/email_subject"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:layout_alignTop="@+id/email_subject"
+        android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+        android:layout_marginRight="@dimen/listitem_horizontal_margin"
         android:scaleType="fitEnd"
-        android:visibility="gone"
-        android:src="@drawable/ic_content_attachment" />
+        android:src="@drawable/ic_content_attachment"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/email_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/email_content"
         android:layout_alignBottom="@+id/email_content"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:layout_alignTop="@+id/email_address"
+        android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+        android:layout_marginRight="@dimen/listitem_horizontal_margin"
         android:visibility="gone" />
 
     <TextView
         android:id="@+id/email_sent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/email_address"
+        android:layout_alignTop="@+id/email_content"
+        android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+        android:layout_marginRight="@dimen/listitem_horizontal_margin"
         android:text="##:## XX"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a07f8bd..3659922 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,4 +6,8 @@
     <dimen name="nav_horizontal_margin">16dp</dimen>
     <dimen name="nav_entry_height">48dp</dimen>
 
+    <dimen name="listitem_height">88dp</dimen>
+    <dimen name="listitem_horizontal_margin">16dp</dimen>
+    <dimen name="listitem_picture_size">40dp</dimen>
+    <dimen name="listitem_text_left_margin">72dp</dimen>
 </resources>