diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index dd28d9b60..4cea27623 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -273,7 +273,9 @@ public final class TaskEditActivity extends TabActivity {
                             ((Button)findViewById(R.id.addons_button)).setOnClickListener(new View.OnClickListener() {
                                 @Override
                                 public void onClick(View v) {
-                                    startActivity(new Intent(TaskEditActivity.this, AddOnActivity.class));
+                                    Intent addOnActivity = new Intent(TaskEditActivity.this, AddOnActivity.class);
+                                    addOnActivity.putExtra(AddOnActivity.TOKEN_START_WITH_AVAILABLE, true);
+                                    startActivity(addOnActivity);
                                 }
                             });
                         }
diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java
index dda14048e..0858040b0 100644
--- a/astrid/src/com/todoroo/astrid/service/AddOnService.java
+++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java
@@ -174,10 +174,6 @@ public class AddOnService {
      * @return
      */
     private boolean isInstalled(String packageName, boolean internal) {
-        if(POWER_PACK_PACKAGE.equals(packageName))
-            return true;
-        if(LOCALE_PACKAGE.equals(packageName))
-            return true;
         if(Constants.PACKAGE.equals(packageName))
             return true;
 
@@ -228,7 +224,7 @@ public class AddOnService {
         Resources r = ContextManager.getContext().getResources();
 
         // temporary temporary
-        AddOn[] list = new AddOn[4];
+        AddOn[] list = new AddOn[3];
         list[0] = new AddOn(false, true, "Astrid Power Pack", null,
                 "Support Astrid and get more productive with the Astrid Power Pack. Backup, widgets, no ads, and calendar integration. Power up today!",
                 POWER_PACK_PACKAGE, "http://www.weloveastrid.com/store",
@@ -244,11 +240,6 @@ public class AddOnService {
                 Constants.PACKAGE, "http://www.producteev.com",
                 ((BitmapDrawable)r.getDrawable(R.drawable.icon_producteev)).getBitmap());
 
-        list[3] = new AddOn(true, false, "Remember the Milk", null,
-                "Synchronize with Remember The Milk service.",
-                Constants.PACKAGE, "http://www.rmilk.com",
-                ((BitmapDrawable)r.getDrawable(R.drawable.ic_menu_refresh)).getBitmap());
-
         return list;
     }