diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 3e98c9f56..ca25efb5e 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -135,16 +135,19 @@
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable_secret_keys" />
         </activity>
+
+        <!-- todo: export disabled, old API -->
         <activity
             android:name=".ui.EditKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:exported="false"
             android:label="@string/title_editKey"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="stateHidden" >
+
+            <!-- TODO: disabled: old api! -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.EDIT_KEYRING" />
-
-                <!-- With permission ACCESS_API: -->
                 <action android:name="org.sufficientlysecure.keychain.action.CREATE_KEYRING" />
 
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index b710e69cf..d52496c04 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -142,10 +142,11 @@ public class EditKeyActivity extends SherlockFragmentActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // TODO: disabled, old API!
         // check permissions for intent actions without user interaction
-        String[] restrictedActions = new String[] { ACTION_CREATE_KEY };
-        OtherHelper.checkPackagePermissionForActions(this, this.getCallingPackage(),
-                Constants.PERMISSION_ACCESS_API, getIntent().getAction(), restrictedActions);
+        // String[] restrictedActions = new String[] { ACTION_CREATE_KEY };
+        // OtherHelper.checkPackagePermissionForActions(this, this.getCallingPackage(),
+        // Constants.PERMISSION_ACCESS_API, getIntent().getAction(), restrictedActions);
 
         setContentView(R.layout.edit_key);