diff --git a/res/layout-land/folder_message_list_child.xml b/res/layout-land/folder_message_list_child.xml
index 606f597a3..f5c541210 100644
--- a/res/layout-land/folder_message_list_child.xml
+++ b/res/layout-land/folder_message_list_child.xml
@@ -17,23 +17,23 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="10sp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:layout_width="310px"
+        android:textSize="12sp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:layout_width="350px"
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@+id/from"
         android:paddingLeft="10px"
         android:layout_marginRight="1px" />
     <TextView
         android:id="@+id/from"
-        android:textSize="10sp"
+        android:textSize="9sp"
         android:layout_toRightOf="@+id/subject"
         android:ellipsize="end"
         android:singleLine="true"
-        android:layout_width="120px"
+        android:layout_width="85px"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?android:attr/textColorSecondary"
         android:paddingLeft="5px"
         android:paddingRight="5px"
         android:drawablePadding="4px"
@@ -42,12 +42,13 @@
         android:id="@+id/date"
         android:ellipsize="end"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="10sp"
+        android:textSize="9sp"
         android:singleLine="true"
         android:textColor="?android:attr/textColorPrimary"
-        android:layout_width="wrap_content"
+        android:layout_width="25px"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
         android:layout_toRightOf="@+id/from"
         />
 </RelativeLayout>
diff --git a/res/layout/folder_message_list_child.xml b/res/layout/folder_message_list_child.xml
index d575bbc68..6242c011a 100644
--- a/res/layout/folder_message_list_child.xml
+++ b/res/layout/folder_message_list_child.xml
@@ -2,7 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="19px"
+    android:layout_height="28px"
     android:paddingRight="1px"
     android:paddingTop="3px"
     android:background="@drawable/folder_message_list_child_background">
@@ -10,44 +10,44 @@
         android:id="@+id/chip"
         android:background="@drawable/appointment_indicator_leftside_1"
         android:layout_width="4px"
-        android:layout_height="20px"
+        android:layout_height="16px"
         android:layout_centerVertical="true" />
     <TextView
         android:id="@+id/subject"
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="10sp"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="11sp"
+        android:textColor="?android:attr/textColorPrimary"
         android:layout_width="200px"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/from"
         android:paddingLeft="10px"
         android:layout_marginRight="1px" />
     <TextView
         android:id="@+id/from"
-        android:textSize="10sp"
-        android:layout_toRightOf="@+id/subject"
+        android:textSize="9sp"
         android:ellipsize="end"
         android:singleLine="true"
-        android:layout_width="70px"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary"
-        android:paddingLeft="5px"
+        android:textColor="?android:attr/textColorSecondary"
         android:paddingRight="5px"
-        android:drawablePadding="4px"
+        android:layout_below="@+id/date"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
         />
     <TextView
         android:id="@+id/date"
         android:ellipsize="end"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="10sp"
+        android:textSize="9sp"
+        android:paddingRight="5px"
         android:singleLine="true"
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_toRightOf="@+id/from"
+        android:layout_alignParentTop="true"
         />
 </RelativeLayout>
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 0ea9d2997..95658f6e1 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -8,7 +8,7 @@
         android:background="@drawable/ic_email_thread_open_top_default">
         <TextView
             android:id="@+id/from"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimaryInverse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
             android:layout_below="@id/from">
             <TextView
                 android:id="@+id/to_label"
-                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="10sp"
                 android:textColor="?android:attr/textColorSecondaryInverse"
                 android:textStyle="bold"
                 android:layout_width="wrap_content"
@@ -42,12 +42,21 @@
                 android:id="@+id/to"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?android:attr/textColorSecondaryInverse"
+                android:textSize="10sp"
                 android:layout_width="0dip"
                 android:layout_weight="1.0"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="4px"
                 android:singleLine="false"
                 android:ellipsize="none" />
+           <TextView
+                android:id="@+id/date"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorPrimaryInverse"
+                android:layout_width="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:layout_height="wrap_content" />
         </LinearLayout>
         <LinearLayout
             android:layout_width="fill_parent"
@@ -59,16 +68,11 @@
                 android:id="@+id/subject"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?android:attr/textColorSecondaryInverse"
+                android:textSize="10sp"
                 android:textStyle="bold"
                 android:layout_width="0dip"
                 android:layout_weight="1.0"
                 android:layout_height="wrap_content" />
-           <TextView
-                android:id="@+id/date"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorPrimaryInverse"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
         </LinearLayout>
     </RelativeLayout>
     <LinearLayout
diff --git a/src/com/fsck/k9/R.java b/src/com/fsck/k9/R.java
index 87d8e5970..a02c5d4a0 100644
--- a/src/com/fsck/k9/R.java
+++ b/src/com/fsck/k9/R.java
@@ -209,8 +209,8 @@ public final class R {
         public static final int message_view_option=0x7f090006;
     }
     public static final class string {
-        public static final int account_delete_dlg_instructions_fmt=0x7f0600c8;
-        public static final int account_delete_dlg_title=0x7f0600c7;
+        public static final int account_delete_dlg_instructions_fmt=0x7f0600ca;
+        public static final int account_delete_dlg_title=0x7f0600c9;
         public static final int account_settings_action=0x7f06001b;
         public static final int account_settings_add_account_label=0x7f0600b9;
         public static final int account_settings_always_bcc_label=0x7f0600c3;
@@ -232,6 +232,8 @@ public final class R {
         public static final int account_settings_outgoing_label=0x7f0600b7;
         public static final int account_settings_outgoing_summary=0x7f0600b8;
         public static final int account_settings_ringtone=0x7f0600bf;
+        public static final int account_settings_sent_items_label=0x7f0600c7;
+        public static final int account_settings_sent_items_summary=0x7f0600c8;
         public static final int account_settings_servers=0x7f0600c0;
         public static final int account_settings_show_combined_label=0x7f0600b3;
         public static final int account_settings_signature_label=0x7f0600c5;
@@ -265,6 +267,9 @@ public final class R {
         /**  Cannot connect to server\n(Connection timed out) 
          */
         public static final int account_setup_failed_dlg_edit_details_action=0x7f0600ab;
+        public static final int account_setup_failed_dlg_invalid_certificate_accept=0x7f0600ce;
+        public static final int account_setup_failed_dlg_invalid_certificate_reject=0x7f0600cf;
+        public static final int account_setup_failed_dlg_invalid_certificate_title=0x7f0600cd;
         /**  Cannot safely connect to server\n(Invalid certificate) 
          */
         public static final int account_setup_failed_dlg_server_message_fmt=0x7f0600aa;
@@ -408,8 +413,8 @@ public final class R {
         public static final int okay_action=0x7f060008;
         public static final int open_action=0x7f06001a;
         public static final int preferences_action=0x7f060019;
-        public static final int provider_note_live=0x7f0600ca;
-        public static final int provider_note_yahoo=0x7f0600c9;
+        public static final int provider_note_live=0x7f0600cc;
+        public static final int provider_note_yahoo=0x7f0600cb;
         public static final int read_action=0x7f06001e;
         public static final int read_attachment_desc=0x7f060003;
         public static final int read_attachment_label=0x7f060002;