diff --git a/TODO b/TODO
index b2718b6..f120a53 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 Fixes:
-- Search for any I2P Android app id (.router, .donate etc.)
 - Figure out how to highlight email backgrounds when selected in list
 - Refine view email page
 -- Delete/read/unread/move actions that don't break everything
diff --git a/app/src/main/java/i2p/bote/android/EmailListActivity.java b/app/src/main/java/i2p/bote/android/EmailListActivity.java
index d51a444..eb83874 100644
--- a/app/src/main/java/i2p/bote/android/EmailListActivity.java
+++ b/app/src/main/java/i2p/bote/android/EmailListActivity.java
@@ -270,8 +270,6 @@ public class EmailListActivity extends ActionBarActivity implements
                 prefs.getString("i2pbote.router.use", "internal").equals("android")) {
             // Try to bind to I2P Android
             Intent i2pIntent = new Intent(IRouterState.class.getName());
-            i2pIntent.setClassName("net.i2p.android.router",
-                    "net.i2p.android.router.service.RouterService");
             try {
                 mTriedBindState = bindService(
                         i2pIntent, mStateConnection, BIND_AUTO_CREATE);
@@ -329,8 +327,7 @@ public class EmailListActivity extends ActionBarActivity implements
                                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                                     public void onClick(DialogInterface dialog, int which) {
                                         dialog.dismiss();
-                                        Intent i = new Intent("net.i2p.android.router");
-                                        i.setAction("net.i2p.android.router.START_I2P");
+                                        Intent i = new Intent("net.i2p.android.router.START_I2P");
                                         EmailListActivity.this.startActivityForResult(i, REQUEST_START_I2P);
                                     }
                                 })