diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
index fc0d07178..1dbbdc6dc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
@@ -22,7 +22,9 @@ package com.todoroo.astrid.reminders;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.widget.Toast;
 
+import com.timsu.astrid.R;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.api.Filter;
@@ -40,10 +42,7 @@ public class NotificationActivity extends Activity {
     // --- constants
 
     /** task id from notification */
-    public static final String TOKEN_ID = "id";
-
-    /** task title */
-    public static final String TOKEN_TITLE = "title";
+    public static final String TOKEN_ID = "id"; //$NON-NLS-1$
 
     // --- implementation
 
@@ -68,14 +67,17 @@ public class NotificationActivity extends Activity {
 
         Intent taskListIntent = new Intent(this, TaskListActivity.class);
         Filter itemFilter = new Filter(ReminderPlugin.IDENTIFIER,
-                "Notification",
-                "Notification",
+                getString(R.string.rmd_NoA_filter),
+                getString(R.string.rmd_NoA_filter),
                 new QueryTemplate().where(TaskCriteria.byId(id)),
                 null);
 
         taskListIntent.putExtra(TaskListActivity.TOKEN_FILTER, itemFilter);
         startActivity(taskListIntent);
 
+        String reminder = Notifications.getRandomReminder(getResources().getStringArray(R.array.reminder_responses));
+        Toast.makeText(this, reminder, Toast.LENGTH_LONG).show();
+
         finish();
     }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
index 50fc25ad7..e7b0d8de0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
@@ -91,7 +91,7 @@ public class Notifications extends BroadcastReceiver {
     }
 
     /** @return a random reminder string */
-    private static String getRandomReminder(String[] reminders) {
+    static String getRandomReminder(String[] reminders) {
         int next = ReminderService.random.nextInt(reminders.length);
         String reminder = reminders[next];
         return reminder;
@@ -152,10 +152,7 @@ public class Notifications extends BroadcastReceiver {
         Resources r = context.getResources();
 
         Intent notifyIntent = new Intent(context, NotificationActivity.class);
-        /*notifyIntent.putExtra(TaskListSubActivity.LOAD_INSTANCE_TOKEN, id);
-        notifyIntent.putExtra(TaskListSubActivity.FROM_NOTIFICATION_TOKEN, true);
-        notifyIntent.putExtra(TaskListSubActivity.NOTIF_FLAGS_TOKEN, flags);
-        notifyIntent.putExtra(TaskListSubActivity.NOTIF_REPEAT_TOKEN, repeatInterval);  TODO */
+        notifyIntent.putExtra(NotificationActivity.TOKEN_ID, id);
         PendingIntent pendingIntent = PendingIntent.getActivity(context,
                 (int)id, notifyIntent, PendingIntent.FLAG_ONE_SHOT);
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPlugin.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPlugin.java
index 0d6692f66..d4c1edd9e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPlugin.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPlugin.java
@@ -4,21 +4,18 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.todoroo.astrid.api.AstridApiConstants;
-import com.todoroo.astrid.api.Plugin;
-
 public class ReminderPlugin extends BroadcastReceiver {
 
-    static final String IDENTIFIER = "reminders";
+    static final String IDENTIFIER = "reminders"; //$NON-NLS-1$
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        Plugin plugin = new Plugin(IDENTIFIER, "Reminders", "Todoroo",
+        /*Plugin plugin = new Plugin(IDENTIFIER, "Reminders", "Todoroo",
                 "Provides notification reminders for tasks");
 
         Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_PLUGINS);
         broadcastIntent.putExtra(AstridApiConstants.EXTRAS_PLUGIN, plugin);
-        context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
+        context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);*/
     }
 
 }
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index 2e92b2332..a14e73903 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -4,6 +4,13 @@
 
   <!-- Resources for built-in reminders plug-in -->
     
+  <!-- ==================================================== notifications == -->
+  
+  <!-- Name of filter when viewing a reminder -->
+  <string name="rmd_NoA_filter">Astrid: Reminder</string>
+    
+  <!-- ============================================= reminder preferences == -->
+  
   <!-- Preference Screen Title -->
   <string name="rmd_EPr_alerts_header">Reminder Settings</string>