diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 5c3bb9e7b..ef0cd8313 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -14,6 +14,7 @@ import org.json.JSONObject;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.text.TextUtils;
@@ -21,12 +22,14 @@ import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CheckedTextView;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -267,7 +270,7 @@ public class EditPeopleControlSet extends PopupControlSet {
         });
     }
 
-    private class AssignedToUser {
+    public static class AssignedToUser {
         public String label;
         public JSONObject user;
 
@@ -359,9 +362,10 @@ public class EditPeopleControlSet extends PopupControlSet {
         }
 
         final int selected = assignedIndex;
-        final ArrayAdapter<AssignedToUser> usersAdapter = new ArrayAdapter<AssignedToUser>(activity,
-                android.R.layout.simple_list_item_single_choice, listValues);
+//        final ArrayAdapter<AssignedToUser> usersAdapter = new ArrayAdapter<AssignedToUser>(activity,
+//                android.R.layout.simple_list_item_single_choice, listValues);
 
+        final AssignedUserAdapter usersAdapter = new AssignedUserAdapter(activity, listValues);
         activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -372,6 +376,29 @@ public class EditPeopleControlSet extends PopupControlSet {
         });
     }
 
+    private class AssignedUserAdapter extends ArrayAdapter<AssignedToUser> {
+
+        public AssignedUserAdapter(Context context, ArrayList<AssignedToUser> people)  {
+            super(context, R.layout.assigned_adapter_row, people);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if(convertView == null)
+                convertView = activity.getLayoutInflater().inflate(R.layout.assigned_adapter_row, parent, false);
+            CheckedTextView ctv = (CheckedTextView) convertView.findViewById(android.R.id.text1);
+            super.getView(position, ctv, parent);
+            AsyncImageView image = (AsyncImageView) convertView.findViewById(R.id.person_image);
+            if (position <= 1) {
+                image.setVisibility(View.GONE);
+            } else {
+                image.setVisibility(View.VISIBLE);
+                image.setUrl(getItem(position).user.optString("picture"));
+            }
+            return convertView;
+        }
+    }
+
     private void setUpListeners() {
         final View assignedClear = getView().findViewById(R.id.assigned_clear);
 
diff --git a/astrid/res/layout/assigned_adapter_row.xml b/astrid/res/layout/assigned_adapter_row.xml
new file mode 100644
index 000000000..7d7a09139
--- /dev/null
+++ b/astrid/res/layout/assigned_adapter_row.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingLeft="5dip">
+
+    <greendroid.widget.AsyncImageView android:id="@+id/person_image"
+        android:layout_width="40dip"
+        android:layout_height="44dip"
+        android:gravity="center"
+        android:layout_gravity="center_vertical"
+        android:scaleType="fitCenter"
+        astrid:defaultSrc="@drawable/ic_contact_picture_2" />
+    <include layout="@android:layout/simple_list_item_single_choice"
+        android:layout_toRightOf="@id/person_image"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index e631417c1..9f4bf3141 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/astrid/res/layout/filter_list_activity.xml
@@ -14,17 +14,6 @@
         android:orientation="horizontal"
         style="@style/Header">
         
-        <ImageView android:id="@+id/back"
-           android:layout_width="43dip"
-           android:layout_height="fill_parent"
-           android:background="?attr/asHeaderButtonBackground"
-           android:padding="7dip"
-           android:src="@drawable/icn_tasks"
-           android:scaleType="fitCenter" />
-       	<View 
-           android:layout_width="0.5dip"
-           android:layout_height="fill_parent"
-           android:background="#ff222222"/>
 
         <!-- Header Logo -->
         <ImageView android:id="@+id/headerLogo"
@@ -36,6 +25,18 @@
             android:src="@drawable/header_logo_new"
             android:scaleType="center"/>
 
+       	<View 
+           android:layout_width="0.5dip"
+           android:layout_height="fill_parent"
+           android:background="#ff222222"/>
+        <ImageView android:id="@+id/back"
+           android:layout_width="43dip"
+           android:layout_height="fill_parent"
+           android:background="?attr/asHeaderButtonBackground"
+           android:padding="7dip"
+           android:src="@drawable/icn_tasks"
+           android:scaleType="fitCenter" />
+
     </LinearLayout>