diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 05e9dab5e..9f94a4f17 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -142,6 +142,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="com.todoroo.astrid.activity.TaskEditActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.item/task" />
+            </intent-filter>
+        </activity>
+
         <!-- Activity launched from shortcut -->
         <activity
             android:name="com.todoroo.astrid.activity.ShortcutActivity"
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
new file mode 100644
index 000000000..f4d2276c6
--- /dev/null
+++ b/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -0,0 +1,23 @@
+package com.todoroo.astrid.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class TaskEditActivity extends Activity {
+
+    private static final String TOKEN_ID = "id";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final long taskId = getIntent().getLongExtra(TOKEN_ID, 0);
+
+        startActivity(new Intent(this, TaskListActivity.class) {{
+            putExtra(TaskListActivity.OPEN_TASK, taskId);
+        }});
+
+        finish();
+    }
+}