diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 0f73d4f22..f6d2b3640 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -72,35 +72,32 @@ public class EditPeopleControlSet implements TaskEditControlSet {
 
     @Autowired TagDataService tagDataService;
 
-    private PeopleContainer sharedWithContainer;
+    private final PeopleContainer sharedWithContainer;
 
-    private CheckBox cbFacebook;
+    private final CheckBox cbFacebook;
 
-    private CheckBox cbTwitter;
+    private final CheckBox cbTwitter;
 
-    private Spinner assignedSpinner;
+    private final Spinner assignedSpinner;
 
-    private EditText assignedCustom;
+    private final EditText assignedCustom;
 
     private final ArrayList<AssignedToUser> spinnerValues = new ArrayList<AssignedToUser>();
 
-    private Activity activity;
+    private final Activity activity;
 
     private String saveToast = null;
 
-    private int loginRequestCode;
+    private final int loginRequestCode;
 
     static {
         AstridDependencyInjector.initialize();
     }
 
-    public EditPeopleControlSet() {
-        DependencyInjectionService.getInstance().inject(this);
-    }
-
     // --- UI initialization
 
     public EditPeopleControlSet(Activity activity, int loginRequestCode) {
+        DependencyInjectionService.getInstance().inject(this);
         this.activity = activity;
         this.loginRequestCode = loginRequestCode;
 
@@ -325,6 +322,9 @@ public class EditPeopleControlSet implements TaskEditControlSet {
      */
     @SuppressWarnings("nls")
     public boolean saveSharingSettings(String toast) {
+        if(task == null)
+            return false;
+
         saveToast = toast;
         boolean dirty = false;
         try {
@@ -559,9 +559,7 @@ public class EditPeopleControlSet implements TaskEditControlSet {
     /** Resume save
      * @param data */
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if(requestCode == loginRequestCode) {
-            if(resultCode == Activity.RESULT_OK)
-                saveSharingSettings(saveToast);
-        }
+        if(requestCode == loginRequestCode && resultCode == Activity.RESULT_OK)
+            saveSharingSettings(saveToast);
     }
 }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index c5bb772d2..b3fd99be1 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -58,7 +58,6 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
-import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.actfm.EditPeopleControlSet;
 import com.todoroo.astrid.alarms.AlarmControlSet;
 import com.todoroo.astrid.api.AstridApiConstants;
@@ -491,12 +490,7 @@ public final class TaskEditActivity extends TabActivity {
         if(title.getText().length() > 0)
             model.setValue(Task.DELETION_DATE, 0L);
 
-        if(!taskService.save(model)) {
-            DialogUtilities.okDialog(this, getString(R.string.DLG_error,
-                    "Error saving task. Please restart the app!"), null); //$NON-NLS-1$
-            return;
-        }
-
+        taskService.save(model);
         if(title.getText().length() == 0)
             return;
 
@@ -566,8 +560,7 @@ public final class TaskEditActivity extends TabActivity {
      * ====================================================================== */
 
     protected void saveButtonClick() {
-        setResult(RESULT_OK);
-        finish();
+        save();
     }
 
     /**
@@ -695,7 +688,7 @@ public final class TaskEditActivity extends TabActivity {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if(requestCode == REQUEST_VOICE_RECOG) {
+        if(requestCode == REQUEST_VOICE_RECOG && resultCode == RESULT_OK) {
             // handle the result of voice recognition, put it into the appropiate textfield
             voiceNoteAssistant.handleActivityResult(requestCode, resultCode, data);
 
diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
index 82c2b41c3..d42f9cc15 100644
--- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
+++ b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
@@ -82,7 +82,7 @@ public class ContactListAdapter extends CursorAdapter {
                 text1.setText(cursor.getString(name));
                 text2.setText(cursor.getString(email));
             }
-            imageView.setImageResource(android.R.drawable.ic_menu_gallery);
+            imageView.setImageResource(R.drawable.ic_contact_picture_2);
             Uri uri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, cursor.getLong(0));
             imageView.setTag(uri);
             ContactImageTask ciTask = new ContactImageTask(imageView);