1 files changed, 7 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index 1bc6d4ee1..8db643583 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -53,7 +53,7 @@ public class KeyListActivity extends DrawerActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_key_list_import:
-                callIntentForDrawerItem(Constants.DrawerItems.IMPORT_KEYS);
+                importKeys();
                 return true;
 
             case R.id.menu_key_list_create:
@@ -65,7 +65,7 @@ public class KeyListActivity extends DrawerActivity {
                 return true;
 
             case R.id.menu_key_list_export:
-                mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE_PUB, true);
+                mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true);
                 return true;
 
             default:
@@ -73,6 +73,11 @@ public class KeyListActivity extends DrawerActivity {
         }
     }
 
+    private void importKeys() {
+        Intent intent = new Intent(this, ImportKeysActivity.class);
+        startActivityForResult(intent, 0);
+    }
+
     private void createKey() {
         Intent intent = new Intent(this, EditKeyActivity.class);
         intent.setAction(EditKeyActivity.ACTION_CREATE_KEY);