diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
index e3b2870c7..3a203723f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
@@ -186,6 +186,9 @@ public final class LocaleEditAlerts extends ExpandableListActivity {
             .setPositiveButton(android.R.string.ok,
                     AddOnActivity.createAddOnClicker(LocaleEditAlerts.this, true))
             .show();
+            FlurryAgent.onEvent("locale-edit-alerts-no-plugin"); //$NON-NLS-1$
+        } else {
+            FlurryAgent.onEvent("locale-edit-alerts"); //$NON-NLS-1$
         }
     }
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 888b20a26..e326b5364 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -495,6 +495,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
         super.onActivityResult(requestCode, resultCode, data);
 
         if(resultCode != RESULT_CANCELED) {
+            taskAdapter.flushCaches();
             loadTaskListContent(true);
             taskService.cleanup();
         }
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 1455605f2..61443285f 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -18,12 +18,12 @@ import android.text.Html;
 import android.text.Html.ImageGetter;
 import android.text.util.Linkify;
 import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
 import android.view.View.OnCreateContextMenuListener;
-import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -42,6 +42,7 @@ import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.SoftHashMap;
 import com.todoroo.astrid.activity.TaskEditActivity;
+import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.alarms.AlarmDetailExposer;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.DetailExposer;
@@ -557,7 +558,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                 public void onClick(View arg0) {
                     Intent intent = new Intent(activity, TaskEditActivity.class);
                     intent.putExtra(TaskEditActivity.TOKEN_ID, taskId);
-                    activity.startActivity(intent);
+                    activity.startActivityForResult(intent, TaskListActivity.ACTIVITY_EDIT_TASK);
                 }
             });
             editButton.setLayoutParams(params);
diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
index 9fce15efb..6f2284796 100644
--- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
+++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
@@ -9,12 +9,14 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ExpandableListView;
 
+import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterCategory;
 import com.todoroo.astrid.api.FilterListItem;
+import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Preferences;
 
 public class WidgetConfigActivity extends ExpandableListActivity {
@@ -56,6 +58,8 @@ public class WidgetConfigActivity extends ExpandableListActivity {
 
         Button button = (Button)findViewById(R.id.ok);
         button.setOnClickListener(mOnClickListener);
+
+        FlurryAgent.onEvent("widget-config"); //$NON-NLS-1$
     }
 
     View.OnClickListener mOnClickListener = new View.OnClickListener() {
@@ -115,6 +119,18 @@ public class WidgetConfigActivity extends ExpandableListActivity {
         adapter.unregisterRecevier();
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        FlurryAgent.onStartSession(this, Constants.FLURRY_KEY);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        FlurryAgent.onEndSession(this);
+    }
+
     private void saveConfiguration(FilterListItem filterListItem) {
         String sql = null, contentValuesString = null, title = null;