diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 8b462a59a..45bed2047 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -142,6 +142,8 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
     /** token for passing a {@link Filter} object through extras */
     public static final String TOKEN_FILTER = "filter"; //$NON-NLS-1$
 
+    private static final String TOKEN_EXTRAS = "extras"; //$NON-NLS-1$
+
     // --- instance variables
 
     @Autowired
@@ -217,14 +219,12 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
             Log.e("tla-instantiate", "tla-instantiate", e);
             newFragment = new TaskListFragment();
         }
-        newFragment.setExtras(extras);
+        Bundle args = new Bundle();
+        args.putBundle(TOKEN_EXTRAS, extras);
+        newFragment.setArguments(args);
         return newFragment;
     }
 
-    public void setExtras(Bundle extras) {
-        this.extras = extras;
-    }
-
     /**
      * Container Activity must implement this interface and we ensure that it
      * does during the onAttach() callback
@@ -261,6 +261,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
     public void onCreate(Bundle savedInstanceState) {
         DependencyInjectionService.getInstance().inject(this);
         super.onCreate(savedInstanceState);
+        extras = getArguments() != null ? getArguments().getBundle(TOKEN_EXTRAS) : null;
     }
 
     /*