diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
index 729f9e27a..3ef04e4f6 100644
--- a/OpenPGP-Keychain/src/main/AndroidManifest.xml
+++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml
@@ -292,6 +292,7 @@
             <intent-filter android:label="@string/intent_import_key">
                 <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" />
                 <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE" />
+		<action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEY_SERVER" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index 5af84ba18..26657479f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -239,7 +239,7 @@ public class DecryptActivity extends DrawerActivity {
                         DecryptActivity.this, mSignatureKeyId);
                 if (key != null) {
                     Intent intent = new Intent(DecryptActivity.this, ImportKeysActivity.class);
-                    intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER);
+                    intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEY_SERVER);
                     intent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, mSignatureKeyId);
                     startActivity(intent);
                 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 695e66314..dc3a07def 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.Locale;
 
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
@@ -56,8 +55,8 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
     public static final String ACTION_IMPORT_KEY = Constants.INTENT_PREFIX + "IMPORT_KEY";
     public static final String ACTION_IMPORT_KEY_FROM_QR_CODE = Constants.INTENT_PREFIX
             + "IMPORT_KEY_FROM_QR_CODE";
-    public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER = Constants.INTENT_PREFIX
-            + "IMPORT_KEY_FROM_KEYSERVER";
+    public static final String ACTION_IMPORT_KEY_FROM_KEY_SERVER = Constants.INTENT_PREFIX
+            + "IMPORT_KEY_FROM_KEY_SERVER";
 
     // Actions for internal use only:
     public static final String ACTION_IMPORT_KEY_FROM_FILE = Constants.INTENT_PREFIX
@@ -68,11 +67,10 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
     // only used by ACTION_IMPORT_KEY
     public static final String EXTRA_KEY_BYTES = "key_bytes";
 
-    // only used by ACTION_IMPORT_KEY_FROM_KEYSERVER
+    // only used by ACTION_IMPORT_KEY_FROM_KEY_SERVER
     public static final String EXTRA_QUERY = "query";
     public static final String EXTRA_KEY_ID = "key_id";
     public static final String EXTRA_FINGERPRINT = "fingerprint";
-//    public static final String RESULT_EXTRA_TEXT = "text";
 
     // view
     private ImportKeysListFragment mListFragment;
@@ -103,7 +101,6 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
         Context context = getSupportActionBar().getThemedContext();
         ArrayAdapter<CharSequence> navigationAdapter = ArrayAdapter.createFromResource(context,
                 R.array.import_action_list, android.R.layout.simple_spinner_dropdown_item);
-//        list.setDropDownViewResource(R.layout.sherlock_spinner_dropdown_item);
         getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         getSupportActionBar().setListNavigationCallbacks(navigationAdapter, this);
 
@@ -145,7 +142,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
                 // directly load data
                 startListFragment(savedInstanceState, importData, null, null);
             }
-        } else if (ACTION_IMPORT_KEY_FROM_KEYSERVER.equals(action)) {
+        } else if (ACTION_IMPORT_KEY_FROM_KEY_SERVER.equals(action)) {
             String query = null;
             if (extras.containsKey(EXTRA_QUERY)) {
                 query = extras.getString(EXTRA_QUERY);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 5b8427ded..99d93fbbd 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -398,7 +398,7 @@ public class ViewKeyActivity extends ActionBarActivity implements
         }
 
         Intent queryIntent = new Intent(this, ImportKeysActivity.class);
-        queryIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER);
+        queryIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEY_SERVER);
         queryIntent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, updateKeyId);
 
         // TODO: lookup??
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
index 76ec6df2c..a0592285f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
@@ -89,7 +89,7 @@ public class LookupUnknownKeyDialogFragment extends DialogFragment {
                 sendMessageToHandler(MESSAGE_OKAY);
 
                 Intent intent = new Intent(activity, ImportKeysActivity.class);
-                intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER);
+                intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEY_SERVER);
                 intent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, unknownKeyId);
                 startActivityForResult(intent, Id.request.look_up_key_id);
             }
diff --git a/README.md b/README.md
index 7f63c93b8..c9894ce49 100644
--- a/README.md
+++ b/README.md
@@ -74,8 +74,9 @@ To do automatic encryption/decryption/sign/verify use the OpenPGP Remote API.
 * ``org.sufficientlysecure.keychain.action.IMPORT_KEY``
   * Extras: ``key_bytes`` (type: ``byte[]``)
   * or set data ``Uri`` (``intent.setData()``) pointing to a file
-* ``org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEYSERVER``
+* ``org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEY_SERVER``
   * Extras: ``query`` (type: ``String``)
+  * or ``fingerprint`` (type: ``String``)
 * ``org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE``
   * without extras, starts Barcode Scanner to get QR Code