diff --git a/res/layout/folder_message_list_child.xml b/res/layout/folder_message_list_child.xml
index 6242c011a..5caa0303f 100644
--- a/res/layout/folder_message_list_child.xml
+++ b/res/layout/folder_message_list_child.xml
@@ -19,21 +19,19 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="11sp"
         android:textColor="?android:attr/textColorPrimary"
-        android:layout_width="200px"
+        android:layout_width="250px"
         android:layout_height="wrap_content"
         android:paddingLeft="10px"
         android:layout_marginRight="1px" />
     <TextView
         android:id="@+id/from"
         android:textSize="9sp"
-        android:ellipsize="end"
         android:singleLine="true"
-        android:layout_width="wrap_content"
+        android:layout_width="70px"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary"
         android:paddingRight="5px"
-        android:layout_below="@+id/date"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
         />
diff --git a/src/com/fsck/k9/activity/FolderMessageList.java b/src/com/fsck/k9/activity/FolderMessageList.java
index 519c5a711..d7b0db808 100644
--- a/src/com/fsck/k9/activity/FolderMessageList.java
+++ b/src/com/fsck/k9/activity/FolderMessageList.java
@@ -1177,7 +1177,7 @@ public class FolderMessageList extends ExpandableListActivity {
                 holder.from.setText(message.sender);
                 holder.from.setTypeface(null, message.read ? Typeface.NORMAL : Typeface.BOLD);
                 holder.date.setText(message.date);
-                holder.from.setCompoundDrawablesWithIntrinsicBounds(null, null,
+                holder.subject.setCompoundDrawablesWithIntrinsicBounds(null, null,
                         message.hasAttachments ? mAttachmentIcon : null, null);
 //                if (folder.outbox) {
 //                    holder.status.setText("Sending");