diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpDecryptVerifyTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyTest.java
similarity index 100%
rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpDecryptVerifyTest.java
rename to OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyTest.java
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java
similarity index 97%
rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java
rename to OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java
index 4f6694049..0e0ec7ee2 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/PgpKeyOperationTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java
@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.tests;
+package org.sufficientlysecure.keychain.pgp;
 
 import junit.framework.AssertionFailedError;
 
@@ -19,12 +19,6 @@ import org.spongycastle.bcpg.sig.KeyFlags;
 import org.spongycastle.openpgp.PGPSignature;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Constants.choice.algorithm;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
-import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
-import org.sufficientlysecure.keychain.pgp.WrappedSignature;
 import org.sufficientlysecure.keychain.service.OperationResultParcel.OperationLog;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.SubkeyAdd;
@@ -40,6 +34,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Random;
 
 @RunWith(RobolectricTestRunner.class)
@@ -208,8 +203,8 @@ public class PgpKeyOperationTest {
         Assert.assertEquals("number of user ids must be two",
                 2, ring.getPublicKey().getUnorderedUserIds().size());
 
-        Assert.assertEquals("number of subkeys must be three",
-                3, KeyringTestingHelper.itToList(ring.getPublicKeys()).size());
+        List<UncachedPublicKey> subkeys = KeyringTestingHelper.itToList(ring.getPublicKeys());
+        Assert.assertEquals("number of subkeys must be three", 3, subkeys.size());
 
         Assert.assertTrue("key ring should have been created in the last 120 seconds",
                 ring.getPublicKey().getCreationTime().after(new Date(new Date().getTime()-1000*120)));
@@ -217,24 +212,21 @@ public class PgpKeyOperationTest {
         Assert.assertNull("key ring should not expire",
                 ring.getPublicKey().getExpiryTime());
 
-        Iterator<UncachedPublicKey> it = ring.getPublicKeys();
-
         Assert.assertEquals("first (master) key can certify",
-                KeyFlags.CERTIFY_OTHER, it.next().getKeyUsage());
+                KeyFlags.CERTIFY_OTHER, subkeys.get(0).getKeyUsage());
 
-        UncachedPublicKey signingKey = it.next();
         Assert.assertEquals("second key can sign",
-                KeyFlags.SIGN_DATA, signingKey.getKeyUsage());
-        ArrayList<WrappedSignature> sigs = signingKey.getSignatures().next().getEmbeddedSignatures();
+                KeyFlags.SIGN_DATA, subkeys.get(1).getKeyUsage());
+        ArrayList<WrappedSignature> sigs = subkeys.get(1).getSignatures().next().getEmbeddedSignatures();
         Assert.assertEquals("signing key signature should have one embedded signature",
                 1, sigs.size());
         Assert.assertEquals("embedded signature should be of primary key binding type",
                 PGPSignature.PRIMARYKEY_BINDING, sigs.get(0).getSignatureType());
         Assert.assertEquals("primary key binding signature issuer should be signing subkey",
-                signingKey.getKeyId(), sigs.get(0).getKeyId());
+                subkeys.get(1).getKeyId(), sigs.get(0).getKeyId());
 
         Assert.assertEquals("third key can encrypt",
-                KeyFlags.ENCRYPT_COMMS, it.next().getKeyUsage());
+                KeyFlags.ENCRYPT_COMMS, subkeys.get(2).getKeyUsage());
 
     }
 
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringCanonicalizeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java
similarity index 98%
rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringCanonicalizeTest.java
rename to OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java
index 97e0d8a68..24b9a3fb6 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringCanonicalizeTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java
@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.tests;
+package org.sufficientlysecure.keychain.pgp;
 
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
@@ -26,11 +26,6 @@ import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
 import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
-import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
-import org.sufficientlysecure.keychain.pgp.WrappedSignature;
 import org.sufficientlysecure.keychain.service.OperationResultParcel;
 import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
similarity index 97%
rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java
rename to OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
index 977ddfc52..6b19e3c55 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringMergeTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.tests;
+package org.sufficientlysecure.keychain.pgp;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -10,13 +10,6 @@ import org.robolectric.shadows.ShadowLog;
 import org.spongycastle.bcpg.PacketTags;
 import org.spongycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
-import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
-import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
 import org.sufficientlysecure.keychain.service.OperationResultParcel;
 import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
similarity index 92%
rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java
rename to OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
index 15aaa4c5d..e0772a7dc 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.tests;
+package org.sufficientlysecure.keychain.pgp;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -9,21 +9,15 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowLog;
 import org.spongycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.pgp.PgpKeyOperation;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
-import org.sufficientlysecure.keychain.service.OperationResultParcel;
 import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.support.KeyringTestingHelper.RawPacket;
-import org.sufficientlysecure.keychain.util.ProgressScaler;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 @org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java
similarity index 98%
rename from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java
rename to OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java
index 665e8ef2b..b0f47af29 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/ProviderHelperKeyringTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/provider/ProviderHelperKeyringTest.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package tests;
+package org.sufficientlysecure.keychain.provider;
 
 import java.util.Collections;
 import java.util.Arrays;
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/FileImportCacheTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/FileImportCacheTest.java
new file mode 100644
index 000000000..b5708b46f
--- /dev/null
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/FileImportCacheTest.java
@@ -0,0 +1,54 @@
+package org.sufficientlysecure.keychain.util;
+
+import android.os.Bundle;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowLog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
+public class FileImportCacheTest {
+
+    @Before
+    public void setUp() throws Exception {
+        ShadowLog.stream = System.out;
+    }
+
+    @Test
+    public void testInputOutput() throws Exception {
+
+        FileImportCache<Bundle> cache = new FileImportCache<Bundle>(Robolectric.application);
+
+        ArrayList<Bundle> list = new ArrayList<Bundle>();
+
+        for (int i = 0; i < 50; i++) {
+            Bundle b = new Bundle();
+            b.putInt("key1", i);
+            b.putString("key2", Integer.toString(i));
+            list.add(b);
+        }
+
+        // write to cache file
+        cache.writeCache(list);
+
+        // read back
+        List<Bundle> last = cache.readCacheIntoList();
+
+        for (int i = 0; i < list.size(); i++) {
+            Assert.assertEquals("input values should be equal to output values",
+                    list.get(i).getInt("key1"), last.get(i).getInt("key1"));
+            Assert.assertEquals("input values should be equal to output values",
+                    list.get(i).getString("key2"), last.get(i).getString("key2"));
+        }
+
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index dfd39b345..e70b134aa 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -61,6 +61,7 @@ public class KeychainApplication extends Application {
         PRNGFixes.apply();
         Log.d(Constants.TAG, "Bouncy Castle set and PRNG Fixes applied!");
 
+        /*
         if (Constants.DEBUG) {
             Provider[] providers = Security.getProviders();
             Log.d(Constants.TAG, "Installed Security Providers:");
@@ -68,6 +69,7 @@ public class KeychainApplication extends Application {
                 Log.d(Constants.TAG, "provider class: " + p.getClass().getName());
             }
         }
+        */
 
         // Create APG directory on sdcard if not existing
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java
deleted file mode 100644
index 08b8afae7..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.keyimport;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Parcel;
-
-import org.sufficientlysecure.keychain.KeychainApplication;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * When sending large data (over 1MB) through Androids Binder IPC you get
- * JavaBinder  E  !!! FAILED BINDER TRANSACTION !!!
- * <p/>
- * To overcome this problem, we cache large Parcelables into a file in our private cache directory
- * instead of sending them through IPC.
- */
-public class FileImportCache {
-
-    private Context mContext;
-
-    private static final String FILENAME = "key_import.pcl";
-    private static final String BUNDLE_DATA = "data";
-
-    public FileImportCache(Context context) {
-        this.mContext = context;
-    }
-
-    public void writeCache(ArrayList<ParcelableKeyRing> selectedEntries) throws IOException {
-        Bundle in = new Bundle();
-        in.putParcelableArrayList(BUNDLE_DATA, selectedEntries);
-        File cacheDir = mContext.getCacheDir();
-        if (cacheDir == null) {
-            // https://groups.google.com/forum/#!topic/android-developers/-694j87eXVU
-            throw new IOException("cache dir is null!");
-        }
-        File tempFile = new File(mContext.getCacheDir(), FILENAME);
-
-        FileOutputStream fos = new FileOutputStream(tempFile);
-        Parcel p = Parcel.obtain(); // creating empty parcel object
-        in.writeToParcel(p, 0); // saving bundle as parcel
-        fos.write(p.marshall()); // writing parcel to file
-        fos.flush();
-        fos.close();
-    }
-
-    public List<ParcelableKeyRing> readCache() throws IOException {
-        Parcel parcel = Parcel.obtain(); // creating empty parcel object
-        Bundle out;
-        File cacheDir = mContext.getCacheDir();
-        if (cacheDir == null) {
-            // https://groups.google.com/forum/#!topic/android-developers/-694j87eXVU
-            throw new IOException("cache dir is null!");
-        }
-
-        File tempFile = new File(cacheDir, FILENAME);
-        try {
-            FileInputStream fis = new FileInputStream(tempFile);
-            byte[] array = new byte[(int) fis.getChannel().size()];
-            fis.read(array, 0, array.length);
-            fis.close();
-
-            parcel.unmarshall(array, 0, array.length);
-            parcel.setDataPosition(0);
-            out = parcel.readBundle(KeychainApplication.class.getClassLoader());
-            out.putAll(out);
-
-            return out.getParcelableArrayList(BUNDLE_DATA);
-        } finally {
-            parcel.recycle();
-            // delete temp file
-            tempFile.delete();
-        }
-    }
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java
index ebc49ab05..7d11a20d3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/KeyRing.java
@@ -1,12 +1,15 @@
 package org.sufficientlysecure.keychain.pgp;
 
+import android.text.TextUtils;
+
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/** An abstract KeyRing.
- *
+/**
+ * An abstract KeyRing.
+ * <p/>
  * This is an abstract class for all KeyRing constructs. It serves as a common
  * denominator of available information, two implementations wrapping the same
  * keyring should in all cases agree on the output of all methods described
@@ -14,7 +17,6 @@ import java.util.regex.Pattern;
  *
  * @see CanonicalizedKeyRing
  * @see org.sufficientlysecure.keychain.provider.CachedPublicKeyRing
- *
  */
 public abstract class KeyRing {
 
@@ -77,4 +79,24 @@ public abstract class KeyRing {
         return result;
     }
 
+    /**
+     * Returns a composed user id. Returns null if name is null!
+     *
+     * @param name
+     * @param email
+     * @param comment
+     * @return
+     */
+    public static String createUserId(String name, String email, String comment) {
+        String userId = name; // consider name a required value
+        if (userId != null && !TextUtils.isEmpty(comment)) {
+            userId += " (" + comment + ")";
+        }
+        if (userId != null && !TextUtils.isEmpty(email)) {
+            userId += " <" + email + ">";
+        }
+
+        return userId;
+    }
+
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 861f93446..19b0d81b7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -609,7 +609,7 @@ public class PgpKeyOperation {
             for (int i = 0; i < saveParcel.mAddSubKeys.size(); i++) {
 
                 progress(R.string.progress_modify_subkeyadd, (i-1) * (100 / saveParcel.mAddSubKeys.size()));
-                SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(0);
+                SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(i);
                 log.add(LogLevel.INFO, LogType.MSG_MF_SUBKEY_NEW, indent);
 
                 if (add.mExpiry != null && new Date(add.mExpiry*1000).before(new Date())) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
index 358b1c552..4a03d942b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
@@ -169,6 +169,7 @@ public class UncachedPublicKey {
     }
 
     @SuppressWarnings("unchecked")
+    // TODO make this safe
     public int getKeyUsage() {
         if(mCacheUsage == null) {
             mCacheUsage = 0;
@@ -182,11 +183,6 @@ public class UncachedPublicKey {
                     if (hashed != null) {
                         mCacheUsage |= hashed.getKeyFlags();
                     }
-
-                    PGPSignatureSubpacketVector unhashed = sig.getUnhashedSubPackets();
-                    if (unhashed != null) {
-                        mCacheUsage |= unhashed.getKeyFlags();
-                    }
                 }
             }
         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 426b86590..7250a861d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -24,6 +24,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.Parcel;
 import android.os.RemoteException;
 
 import org.sufficientlysecure.keychain.Constants;
@@ -31,7 +32,7 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.FileHelper;
 import org.sufficientlysecure.keychain.helper.OtherHelper;
 import org.sufficientlysecure.keychain.helper.Preferences;
-import org.sufficientlysecure.keychain.keyimport.FileImportCache;
+import org.sufficientlysecure.keychain.util.FileImportCache;
 import org.sufficientlysecure.keychain.keyimport.HkpKeyserver;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.keyimport.KeybaseKeyserver;
@@ -386,14 +387,16 @@ public class KeychainIntentService extends IntentService
             }
         } else if (ACTION_IMPORT_KEYRING.equals(action)) {
             try {
+
                 List<ParcelableKeyRing> entries;
                 if (data.containsKey(IMPORT_KEY_LIST)) {
                     // get entries from intent
                     entries = data.getParcelableArrayList(IMPORT_KEY_LIST);
                 } else {
                     // get entries from cached file
-                    FileImportCache cache = new FileImportCache(this);
-                    entries = cache.readCache();
+                    FileImportCache<ParcelableKeyRing> cache =
+                        new FileImportCache<ParcelableKeyRing>(this);
+                    entries = cache.readCacheIntoList();
                 }
 
                 PgpImportExport pgpImportExport = new PgpImportExport(this, this);
@@ -522,6 +525,7 @@ public class KeychainIntentService extends IntentService
 
                 Intent importIntent = new Intent(this, KeychainIntentService.class);
                 importIntent.setAction(ACTION_IMPORT_KEYRING);
+
                 Bundle importData = new Bundle();
                 // This is not going through binder, nothing to fear of
                 importData.putParcelableArrayList(IMPORT_KEY_LIST, keyRings);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
index f9ed16cba..662ba4ce1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -35,6 +35,7 @@ import org.spongycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
@@ -171,7 +172,7 @@ public class CreateKeyFinalFragment extends Fragment {
         parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Constants.choice.algorithm.rsa, 4096, KeyFlags.CERTIFY_OTHER, null));
         parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Constants.choice.algorithm.rsa, 4096, KeyFlags.SIGN_DATA, null));
         parcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Constants.choice.algorithm.rsa, 4096, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, null));
-        String userId = mName + " <" + mEmail + ">";
+        String userId = KeyRing.createUserId(mName, mEmail, null);
         parcel.mAddUserIds.add(userId);
         parcel.mNewPassphrase = mPassphrase;
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
index 9083d1567..b76755bb2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -43,6 +43,8 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
 import org.sufficientlysecure.keychain.helper.ActionBarHelper;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
+import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
@@ -55,6 +57,7 @@ import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter;
 import org.sufficientlysecure.keychain.ui.adapter.SubkeysAddedAdapter;
 import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter;
 import org.sufficientlysecure.keychain.ui.adapter.UserIdsAddedAdapter;
+import org.sufficientlysecure.keychain.ui.dialog.AddUserIdDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.ChangeExpiryDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.EditSubkeyDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.EditUserIdDialogFragment;
@@ -89,11 +92,10 @@ public class EditKeyFragment extends LoaderFragment implements
     private UserIdsAddedAdapter mUserIdsAddedAdapter;
     private SubkeysAddedAdapter mSubkeysAddedAdapter;
 
-    private ArrayList<UserIdsAddedAdapter.UserIdModel> mUserIdsAddedData;
-
     private Uri mDataUri;
 
     private SaveKeyringParcel mSaveKeyringParcel;
+    private String mPrimaryUserId;
 
     private String mCurrentPassphrase;
 
@@ -173,8 +175,13 @@ public class EditKeyFragment extends LoaderFragment implements
 
             mSaveKeyringParcel = new SaveKeyringParcel(keyRing.getMasterKeyId(),
                     keyRing.getUncachedKeyRing().getFingerprint());
+            mPrimaryUserId = keyRing.getPrimaryUserIdWithFallback();
         } catch (ProviderHelper.NotFoundException e) {
-            Log.e(Constants.TAG, "Keyring not found: " + e.getMessage(), e);
+            Log.e(Constants.TAG, "Keyring not found", e);
+            Toast.makeText(getActivity(), R.string.error_no_secret_key_found, Toast.LENGTH_SHORT).show();
+            getActivity().finish();
+        } catch (PgpGeneralException e) {
+            Log.e(Constants.TAG, "PgpGeneralException", e);
             Toast.makeText(getActivity(), R.string.error_no_secret_key_found, Toast.LENGTH_SHORT).show();
             getActivity().finish();
         }
@@ -213,9 +220,8 @@ public class EditKeyFragment extends LoaderFragment implements
             }
         });
 
-        // TODO: mUserIdsAddedData and SaveParcel from savedInstance?!
-        mUserIdsAddedData = new ArrayList<UserIdsAddedAdapter.UserIdModel>();
-        mUserIdsAddedAdapter = new UserIdsAddedAdapter(getActivity(), mUserIdsAddedData);
+        // TODO: SaveParcel from savedInstance?!
+        mUserIdsAddedAdapter = new UserIdsAddedAdapter(getActivity(), mSaveKeyringParcel.mAddUserIds);
         mUserIdsAddedList.setAdapter(mUserIdsAddedAdapter);
 
         mSubkeysAdapter = new SubkeysAdapter(getActivity(), null, 0, mSaveKeyringParcel);
@@ -421,7 +427,29 @@ public class EditKeyFragment extends LoaderFragment implements
     }
 
     private void addUserId() {
-        mUserIdsAddedAdapter.add(new UserIdsAddedAdapter.UserIdModel());
+        // Message is received after passphrase is cached
+        Handler returnHandler = new Handler() {
+            @Override
+            public void handleMessage(Message message) {
+                if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) {
+                    Bundle data = message.getData();
+
+                    // add new user id
+                    mUserIdsAddedAdapter.add(data
+                            .getString(AddUserIdDialogFragment.MESSAGE_DATA_USER_ID));
+                }
+            }
+        };
+
+        // Create a new Messenger for the communication back
+        Messenger messenger = new Messenger(returnHandler);
+
+        // pre-fill out primary name
+        String predefinedName = KeyRing.splitUserId(mPrimaryUserId)[0];
+        AddUserIdDialogFragment addUserIdDialog = AddUserIdDialogFragment.newInstance(messenger,
+                predefinedName);
+
+        addUserIdDialog.show(getActivity().getSupportFragmentManager(), "addUserIdDialog");
     }
 
     private void addSubkey() {
@@ -451,8 +479,6 @@ public class EditKeyFragment extends LoaderFragment implements
     }
 
     private void save(String passphrase) {
-        mSaveKeyringParcel.mAddUserIds = mUserIdsAddedAdapter.getDataAsStringList();
-
         Log.d(Constants.TAG, "mSaveKeyringParcel.mAddUserIds: " + mSaveKeyringParcel.mAddUserIds);
         Log.d(Constants.TAG, "mSaveKeyringParcel.mNewPassphrase: " + mSaveKeyringParcel.mNewPassphrase);
         Log.d(Constants.TAG, "mSaveKeyringParcel.mRevokeUserIds: " + mSaveKeyringParcel.mRevokeUserIds);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index dbc557f9a..4a606a1b3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -40,7 +40,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.OtherHelper;
 import org.sufficientlysecure.keychain.helper.Preferences;
-import org.sufficientlysecure.keychain.keyimport.FileImportCache;
+import org.sufficientlysecure.keychain.util.FileImportCache;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
@@ -503,7 +503,7 @@ public class ImportKeysActivity extends ActionBarActivity {
             // to prevent Java Binder problems on heavy imports
             // read FileImportCache for more info.
             try {
-                FileImportCache cache = new FileImportCache(this);
+                FileImportCache<ParcelableKeyRing> cache = new FileImportCache<ParcelableKeyRing>(this);
                 cache.writeCache(selectedEntries);
 
                 intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
index e5dbebe01..c2a882fdb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
@@ -114,7 +114,7 @@ public class SubkeysAdapter extends CursorAdapter {
         ImageView vEncryptIcon = (ImageView) view.findViewById(R.id.ic_encryptKey);
         ImageView vSignIcon = (ImageView) view.findViewById(R.id.ic_signKey);
         ImageView vRevokedKeyIcon = (ImageView) view.findViewById(R.id.ic_revokedKey);
-        ImageView vEditImage = (ImageView) view.findViewById(R.id.edit_image);
+        ImageView vEditImage = (ImageView) view.findViewById(R.id.user_id_item_edit_image);
 
         long keyId = cursor.getLong(INDEX_KEY_ID);
         String keyIdStr = PgpKeyHelper.convertKeyIdToHex(keyId);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
index 6d46f3c8f..ee3341c08 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
@@ -102,11 +102,14 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
-        TextView vName = (TextView) view.findViewById(R.id.userId);
-        TextView vAddress = (TextView) view.findViewById(R.id.address);
-        TextView vComment = (TextView) view.findViewById(R.id.comment);
-        ImageView vVerified = (ImageView) view.findViewById(R.id.certified);
-        ImageView vEditImage = (ImageView) view.findViewById(R.id.edit_image);
+        TextView vName = (TextView) view.findViewById(R.id.user_id_item_name);
+        TextView vAddress = (TextView) view.findViewById(R.id.user_id_item_address);
+        TextView vComment = (TextView) view.findViewById(R.id.user_id_item_comment);
+        ImageView vVerified = (ImageView) view.findViewById(R.id.user_id_item_certified);
+        View vVerifiedLayout = view.findViewById(R.id.user_id_item_certified_layout);
+        ImageView vEditImage = (ImageView) view.findViewById(R.id.user_id_item_edit_image);
+        ImageView vDeleteButton = (ImageView) view.findViewById(R.id.user_id_item_delete_button);
+        vDeleteButton.setVisibility(View.GONE); // not used
 
         String userId = cursor.getString(INDEX_USER_ID);
         String[] splitUserId = KeyRing.splitUserId(userId);
@@ -152,8 +155,10 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
             }
 
             vEditImage.setVisibility(View.VISIBLE);
+            vVerifiedLayout.setVisibility(View.GONE);
         } else {
             vEditImage.setVisibility(View.GONE);
+            vVerifiedLayout.setVisibility(View.VISIBLE);
         }
 
         if (isRevoked) {
@@ -211,7 +216,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
             return;
         }
 
-        final CheckBox vCheckBox = (CheckBox) view.findViewById(R.id.checkBox);
+        final CheckBox vCheckBox = (CheckBox) view.findViewById(R.id.user_id_item_check_box);
         final int position = cursor.getPosition();
         vCheckBox.setOnCheckedChangeListener(null);
         vCheckBox.setChecked(mCheckStates.get(position));
@@ -225,7 +230,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
     }
 
     public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
-        CheckBox box = ((CheckBox) view.findViewById(R.id.checkBox));
+        CheckBox box = ((CheckBox) view.findViewById(R.id.user_id_item_check_box));
         if (box != null) {
             box.toggle();
         }
@@ -251,7 +256,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
         View view = mInflater.inflate(R.layout.view_key_user_id_item, null);
         // only need to do this once ever, since mShowCheckBoxes is final
-        view.findViewById(R.id.checkBox).setVisibility(mCheckStates != null ? View.VISIBLE : View.GONE);
+        view.findViewById(R.id.user_id_item_check_box).setVisibility(mCheckStates != null ? View.VISIBLE : View.GONE);
         return view;
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
index 3fe5574ee..15ac11e0b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
@@ -19,163 +19,66 @@ package org.sufficientlysecure.keychain.ui.adapter;
 
 import android.app.Activity;
 import android.content.Context;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.EditText;
+import android.widget.CheckBox;
 import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.helper.ContactHelper;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
 
-public class UserIdsAddedAdapter extends ArrayAdapter<UserIdsAddedAdapter.UserIdModel> {
+public class UserIdsAddedAdapter extends ArrayAdapter<String> {
     private LayoutInflater mInflater;
-    private Activity mActivity;
-
-    private ArrayAdapter<String> mAutoCompleteNameAdapter;
-    private ArrayAdapter<String> mAutoCompleteEmailAdapter;
 
     // hold a private reference to the underlying data List
-    private List<UserIdModel> mData;
+    private List<String> mData;
 
-    public static class UserIdModel {
-        String name = "";
-        String address = "";
-        String comment = "";
-
-        @Override
-        public String toString() {
-            String userId = name;
-            if (!TextUtils.isEmpty(comment)) {
-                userId += " (" + comment + ")";
-            }
-            if (!TextUtils.isEmpty(address)) {
-                userId += " <" + address + ">";
-            }
-            return userId;
-        }
-    }
-
-    public UserIdsAddedAdapter(Activity activity, List<UserIdModel> data) {
+    public UserIdsAddedAdapter(Activity activity, List<String> data) {
         super(activity, -1, data);
-        mActivity = activity;
         mInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mData = data;
-        mAutoCompleteNameAdapter = new ArrayAdapter<String>
-                (mActivity, android.R.layout.simple_spinner_dropdown_item,
-                        ContactHelper.getPossibleUserNames(mActivity)
-                );
-        mAutoCompleteEmailAdapter = new ArrayAdapter<String>
-                (mActivity, android.R.layout.simple_spinner_dropdown_item,
-                        ContactHelper.getPossibleUserEmails(mActivity)
-                );
     }
 
-    public ArrayList<String> getDataAsStringList() {
-        ArrayList<String> out = new ArrayList<String>();
-        for (UserIdModel id : mData) {
-            // ignore empty user ids
-            if (!TextUtils.isEmpty(id.toString())) {
-                out.add(id.toString());
-            }
-        }
-
-        return out;
+    public List<String> getData() {
+        return mData;
     }
 
     static class ViewHolder {
-        public AutoCompleteTextView vAddress;
-        public AutoCompleteTextView vName;
-        public EditText vComment;
+        public TextView vAddress;
+        public TextView vName;
+        public TextView vComment;
         public ImageButton vDelete;
         // also hold a reference to the model item
-        public UserIdModel mModel;
+        public String mModel;
     }
 
     public View getView(final int position, View convertView, ViewGroup parent) {
         if (convertView == null) {
             // Not recycled, inflate a new view
-            convertView = mInflater.inflate(R.layout.edit_key_user_id_added_item, null);
+            convertView = mInflater.inflate(R.layout.view_key_user_id_item, null);
             final ViewHolder holder = new ViewHolder();
-            holder.vAddress = (AutoCompleteTextView) convertView.findViewById(R.id.user_id_added_item_address);
-            holder.vName = (AutoCompleteTextView) convertView.findViewById(R.id.user_id_added_item_name);
-            holder.vComment = (EditText) convertView.findViewById(R.id.user_id_added_item_comment);
-            holder.vDelete = (ImageButton) convertView.findViewById(R.id.user_id_added_item_delete);
+            holder.vAddress = (TextView) convertView.findViewById(R.id.user_id_item_address);
+            holder.vName = (TextView) convertView.findViewById(R.id.user_id_item_name);
+            holder.vComment = (TextView) convertView.findViewById(R.id.user_id_item_comment);
+            holder.vDelete = (ImageButton) convertView.findViewById(R.id.user_id_item_delete_button);
+            holder.vDelete.setVisibility(View.VISIBLE); // always visible
+
+            // not used:
+            CheckBox checkBox = (CheckBox) convertView.findViewById(R.id.user_id_item_check_box);
+            View certifiedLayout = convertView.findViewById(R.id.user_id_item_certified_layout);
+            ImageView editImage = (ImageView) convertView.findViewById(R.id.user_id_item_edit_image);
+            checkBox.setVisibility(View.GONE);
+            certifiedLayout.setVisibility(View.GONE);
+            editImage.setVisibility(View.GONE);
+
             convertView.setTag(holder);
 
-            holder.vAddress.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                    // update referenced item in view holder
-                    holder.mModel.address = s.toString();
-
-                    // show icon on valid email addresses
-                    if (holder.mModel.address.length() > 0) {
-                        Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(holder.mModel.address);
-                        if (emailMatcher.matches()) {
-                            holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0,
-                                    R.drawable.uid_mail_ok, 0);
-                        } else {
-                            holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0,
-                                    R.drawable.uid_mail_bad, 0);
-                        }
-                    } else {
-                        // remove drawable if email is empty
-                        holder.vAddress.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
-                    }
-                }
-            });
-
-            holder.vName.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                    // update referenced item in view holder
-                    holder.mModel.name = s.toString();
-                }
-            });
-
-            holder.vComment.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                    // update referenced item in view holder
-                    holder.mModel.comment = s.toString();
-                }
-            });
-
             holder.vDelete.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -183,22 +86,30 @@ public class UserIdsAddedAdapter extends ArrayAdapter<UserIdsAddedAdapter.UserId
                     UserIdsAddedAdapter.this.remove(holder.mModel);
                 }
             });
-
         }
         final ViewHolder holder = (ViewHolder) convertView.getTag();
 
         // save reference to model item
         holder.mModel = getItem(position);
 
-        holder.vAddress.setText(holder.mModel.address);
-        holder.vAddress.setThreshold(1); // Start working from first character
-        holder.vAddress.setAdapter(mAutoCompleteEmailAdapter);
-
-        holder.vName.setText(holder.mModel.name);
-        holder.vName.setThreshold(1); // Start working from first character
-        holder.vName.setAdapter(mAutoCompleteNameAdapter);
-
-        holder.vComment.setText(holder.mModel.comment);
+        String[] splitUserId = KeyRing.splitUserId(holder.mModel);
+        if (splitUserId[0] != null) {
+            holder.vName.setText(splitUserId[0]);
+        } else {
+            holder.vName.setText(R.string.user_id_no_name);
+        }
+        if (splitUserId[1] != null) {
+            holder.vAddress.setText(splitUserId[1]);
+            holder.vAddress.setVisibility(View.VISIBLE);
+        } else {
+            holder.vAddress.setVisibility(View.GONE);
+        }
+        if (splitUserId[2] != null) {
+            holder.vComment.setText(splitUserId[2]);
+            holder.vComment.setVisibility(View.VISIBLE);
+        } else {
+            holder.vComment.setVisibility(View.GONE);
+        }
 
         return convertView;
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java
new file mode 100644
index 000000000..d5264ae10
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui.dialog;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.os.Bundle;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.support.v4.app.DialogFragment;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Patterns;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.helper.ContactHelper;
+import org.sufficientlysecure.keychain.pgp.KeyRing;
+import org.sufficientlysecure.keychain.util.Log;
+
+import java.util.regex.Matcher;
+
+public class AddUserIdDialogFragment extends DialogFragment implements OnEditorActionListener {
+    private static final String ARG_MESSENGER = "messenger";
+    private static final String ARG_NAME = "name";
+
+    public static final int MESSAGE_OKAY = 1;
+    public static final int MESSAGE_CANCEL = 2;
+
+    public static final String MESSAGE_DATA_USER_ID = "user_id";
+
+    private Messenger mMessenger;
+    private AutoCompleteTextView mName;
+    private AutoCompleteTextView mEmail;
+    private EditText mComment;
+
+    public static AddUserIdDialogFragment newInstance(Messenger messenger, String predefinedName) {
+
+        AddUserIdDialogFragment frag = new AddUserIdDialogFragment();
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_MESSENGER, messenger);
+        args.putString(ARG_NAME, predefinedName);
+        frag.setArguments(args);
+
+        return frag;
+    }
+
+    /**
+     * Creates dialog
+     */
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Activity activity = getActivity();
+        mMessenger = getArguments().getParcelable(ARG_MESSENGER);
+        String predefinedName = getArguments().getString(ARG_NAME);
+
+        ArrayAdapter<String> autoCompleteEmailAdapter = new ArrayAdapter<String>
+                (getActivity(), android.R.layout.simple_spinner_dropdown_item,
+                        ContactHelper.getPossibleUserEmails(getActivity())
+                );
+
+        CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity);
+
+        alert.setTitle(R.string.edit_key_action_add_identity);
+
+        LayoutInflater inflater = activity.getLayoutInflater();
+        View view = inflater.inflate(R.layout.add_user_id_dialog, null);
+        alert.setView(view);
+
+        mName = (AutoCompleteTextView) view.findViewById(R.id.add_user_id_name);
+        mEmail = (AutoCompleteTextView) view.findViewById(R.id.add_user_id_address);
+        mComment = (EditText) view.findViewById(R.id.add_user_id_comment);
+
+        mName.setText(predefinedName);
+
+        mEmail.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                String email = editable.toString();
+                if (email.length() > 0) {
+                    Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
+                    if (emailMatcher.matches()) {
+                        mEmail.setCompoundDrawablesWithIntrinsicBounds(0, 0,
+                                R.drawable.uid_mail_ok, 0);
+                    } else {
+                        mEmail.setCompoundDrawablesWithIntrinsicBounds(0, 0,
+                                R.drawable.uid_mail_bad, 0);
+                    }
+                } else {
+                    // remove drawable if email is empty
+                    mEmail.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+                }
+            }
+        });
+        mEmail.setThreshold(1); // Start working from first character
+        mEmail.setAdapter(autoCompleteEmailAdapter);
+
+        alert.setPositiveButton(android.R.string.ok, new OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int id) {
+                dismiss();
+
+                // return new user id back to activity
+                Bundle data = new Bundle();
+                String userId = KeyRing.createUserId(mName.getText().toString(),
+                        mEmail.getText().toString(), mComment.getText().toString());
+                data.putString(MESSAGE_DATA_USER_ID, userId);
+                sendMessageToHandler(MESSAGE_OKAY, data);
+            }
+        });
+
+        alert.setNegativeButton(android.R.string.cancel, new OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int id) {
+                dialog.cancel();
+            }
+        });
+
+        // Hack to open keyboard.
+        // This is the only method that I found to work across all Android versions
+        // http://turbomanage.wordpress.com/2012/05/02/show-soft-keyboard-automatically-when-edittext-receives-focus/
+        // Notes: * onCreateView can't be used because we want to add buttons to the dialog
+        //        * opening in onActivityCreated does not work on Android 4.4
+        mEmail.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                mEmail.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        InputMethodManager imm = (InputMethodManager) getActivity()
+                                .getSystemService(Context.INPUT_METHOD_SERVICE);
+                        imm.showSoftInput(mEmail, InputMethodManager.SHOW_IMPLICIT);
+                    }
+                });
+            }
+        });
+        mEmail.requestFocus();
+
+        mComment.setImeActionLabel(getString(android.R.string.ok), EditorInfo.IME_ACTION_DONE);
+        mComment.setOnEditorActionListener(this);
+
+        return alert.show();
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        super.onCancel(dialog);
+
+        dismiss();
+        sendMessageToHandler(MESSAGE_CANCEL);
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        Log.d(Constants.TAG, "onDismiss");
+
+        // hide keyboard on dismiss
+        hideKeyboard();
+    }
+
+    private void hideKeyboard() {
+        InputMethodManager inputManager = (InputMethodManager) getActivity()
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        //check if no view has focus:
+        View v = getActivity().getCurrentFocus();
+        if (v == null)
+            return;
+
+        inputManager.hideSoftInputFromWindow(v.getWindowToken(), 0);
+    }
+
+    /**
+     * Associate the "done" button on the soft keyboard with the okay button in the view
+     */
+    @Override
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+        if (EditorInfo.IME_ACTION_DONE == actionId) {
+            AlertDialog dialog = ((AlertDialog) getDialog());
+            Button bt = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+
+            bt.performClick();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Send message back to handler which is initialized in a activity
+     *
+     * @param what Message integer you want to send
+     */
+    private void sendMessageToHandler(Integer what) {
+        Message msg = Message.obtain();
+        msg.what = what;
+
+        try {
+            mMessenger.send(msg);
+        } catch (RemoteException e) {
+            Log.w(Constants.TAG, "Exception sending message, Is handler present?", e);
+        } catch (NullPointerException e) {
+            Log.w(Constants.TAG, "Messenger is null!", e);
+        }
+    }
+
+    /**
+     * Send message back to handler which is initialized in a activity
+     *
+     * @param what Message integer you want to send
+     */
+    private void sendMessageToHandler(Integer what, Bundle data) {
+        Message msg = Message.obtain();
+        msg.what = what;
+        if (data != null) {
+            msg.setData(data);
+        }
+
+        try {
+            mMessenger.send(msg);
+        } catch (RemoteException e) {
+            Log.w(Constants.TAG, "Exception sending message, Is handler present?", e);
+        } catch (NullPointerException e) {
+            Log.w(Constants.TAG, "Messenger is null!", e);
+        }
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
index 9b561f819..f50d2adc6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
@@ -110,7 +110,7 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene
         mName = (EditText) findViewById(R.id.name);
         mName.addTextChangedListener(mTextWatcher);
         mEmail = (AutoCompleteTextView) findViewById(R.id.email);
-        mComment = (EditText) findViewById(R.id.comment);
+        mComment = (EditText) findViewById(R.id.user_id_item_comment);
         mComment.addTextChangedListener(mTextWatcher);
 
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileImportCache.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileImportCache.java
new file mode 100644
index 000000000..5a4bf5311
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileImportCache.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.util;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.KeychainApplication;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * When sending large data (over 1MB) through Androids Binder IPC you get
+ * JavaBinder  E  !!! FAILED BINDER TRANSACTION !!!
+ * <p/>
+ * To overcome this problem, we cache large Parcelables into a file in our private cache directory
+ * instead of sending them through IPC.
+ */
+public class FileImportCache<E extends Parcelable> {
+
+    private Context mContext;
+
+    private static final String FILENAME = "key_import.pcl";
+
+    public FileImportCache(Context context) {
+        this.mContext = context;
+    }
+
+    public void writeCache(ArrayList<E> selectedEntries) throws IOException {
+        writeCache(selectedEntries.iterator());
+    }
+
+    public void writeCache(Iterator<E> it) throws IOException {
+
+        File cacheDir = mContext.getCacheDir();
+        if (cacheDir == null) {
+            // https://groups.google.com/forum/#!topic/android-developers/-694j87eXVU
+            throw new IOException("cache dir is null!");
+        }
+
+        File tempFile = new File(mContext.getCacheDir(), FILENAME);
+
+        DataOutputStream oos = new DataOutputStream(new FileOutputStream(tempFile));
+
+        while (it.hasNext()) {
+            Parcel p = Parcel.obtain(); // creating empty parcel object
+            p.writeParcelable(it.next(), 0); // saving bundle as parcel
+            byte[] buf = p.marshall();
+            oos.writeInt(buf.length);
+            oos.write(buf);
+            p.recycle();
+        }
+
+        oos.close();
+
+    }
+
+    public List<E> readCacheIntoList() throws IOException {
+        ArrayList<E> result = new ArrayList<E>();
+        Iterator<E> it = readCache();
+        while (it.hasNext()) {
+            result.add(it.next());
+        }
+        return result;
+    }
+
+    public Iterator<E> readCache() throws IOException {
+
+        File cacheDir = mContext.getCacheDir();
+        if (cacheDir == null) {
+            // https://groups.google.com/forum/#!topic/android-developers/-694j87eXVU
+            throw new IOException("cache dir is null!");
+        }
+
+        final File tempFile = new File(cacheDir, FILENAME);
+        final DataInputStream ois = new DataInputStream(new FileInputStream(tempFile));
+
+        return new Iterator<E>() {
+
+            E mRing = null;
+            boolean closed = false;
+            byte[] buf = new byte[512];
+
+            private void readNext() {
+                if (mRing != null || closed) {
+                    return;
+                }
+
+                try {
+
+                    int length = ois.readInt();
+                    while (buf.length < length) {
+                        buf = new byte[buf.length * 2];
+                    }
+                    ois.readFully(buf, 0, length);
+
+                    Parcel parcel = Parcel.obtain(); // creating empty parcel object
+                    parcel.unmarshall(buf, 0, length);
+                    parcel.setDataPosition(0);
+                    mRing = parcel.readParcelable(KeychainApplication.class.getClassLoader());
+                    parcel.recycle();
+                } catch (EOFException e) {
+                    // aight
+                    close();
+                } catch (IOException e) {
+                    Log.e(Constants.TAG, "Encountered IOException during cache read!", e);
+                }
+
+            }
+
+            @Override
+            public boolean hasNext() {
+                readNext();
+                return mRing != null;
+            }
+
+            @Override
+            public E next() {
+                readNext();
+                try {
+                    return mRing;
+                } finally {
+                    mRing = null;
+                }
+            }
+
+            @Override
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void finalize() throws Throwable {
+                close();
+                super.finalize();
+            }
+
+            private void close() {
+                if (!closed) {
+                    try {
+                        ois.close();
+                        tempFile.delete();
+                    } catch (IOException e) {
+                        // nvm
+                    }
+                }
+                closed = true;
+            }
+
+
+        };
+    }
+}
diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
new file mode 100644
index 000000000..2575db4ba
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp">
+
+    <AutoCompleteTextView
+        android:id="@+id/add_user_id_address"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/label_email"
+        android:imeOptions="actionNext"
+        android:inputType="textEmailAddress"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <AutoCompleteTextView
+        android:id="@+id/add_user_id_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionNext"
+        android:inputType="textPersonName"
+        android:hint="@string/create_key_hint_full_name"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <EditText
+        android:id="@+id/add_user_id_comment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/tertiary_text_light"
+        android:singleLine="true"
+        android:lines="1"
+        android:maxLines="1"
+        android:imeOptions="actionDone"
+        android:hint="@string/label_comment"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index 588cbb050..6e629573a 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -64,6 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
+                android:imeOptions="actionNext"
                 android:inputType="textPassword"
                 android:hint="@string/label_passphrase"
                 android:ems="10"
diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml
deleted file mode 100644
index ef0e2626e..000000000
--- a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:singleLine="true">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:minWidth="10dp"
-        android:background="@color/android_green_light" />
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_gravity="center_vertical"
-        android:layout_width="0dip"
-        android:layout_marginLeft="8dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-
-        <AutoCompleteTextView
-            android:id="@+id/user_id_added_item_address"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/label_email"
-            android:inputType="textEmailAddress"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <AutoCompleteTextView
-            android:id="@+id/user_id_added_item_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPersonName"
-            android:hint="@string/label_name"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <EditText
-            android:id="@+id/user_id_added_item_comment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/tertiary_text_light"
-            android:hint="@string/label_comment"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/user_id_added_item_delete"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:padding="8dp"
-        android:src="@drawable/ic_action_cancel"
-        android:layout_gravity="center_vertical"
-        style="@style/SelectableItem" />
-
-</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
index 3454d3668..877ea77db 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
@@ -67,7 +67,7 @@
                     android:text="@string/label_comment" />
 
                 <EditText
-                    android:id="@+id/comment"
+                    android:id="@+id/user_id_item_comment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
index 0c0a5d7e6..226ed52cf 100644
--- a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
@@ -20,7 +20,7 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/edit_image"
+        android:id="@+id/user_id_item_edit_image"
         android:src="@drawable/ic_action_edit"
         android:padding="8dp"
         android:layout_centerVertical="true"
@@ -30,7 +30,7 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_toRightOf="@id/ic_masterKey"
-        android:layout_toLeftOf="@id/edit_image"
+        android:layout_toLeftOf="@id/user_id_item_edit_image"
         android:layout_centerVertical="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
index 157903000..e6dae3eeb 100644
--- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
@@ -7,13 +7,14 @@
     android:singleLine="true">
 
     <CheckBox
-        android:id="@+id/checkBox"
+        android:id="@+id/user_id_item_check_box"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:clickable="false"
         android:focusable="false" />
 
     <LinearLayout
+        android:id="@+id/user_id_item_certified_layout"
         android:layout_width="22dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
@@ -21,9 +22,9 @@
         android:orientation="vertical">
 
         <ImageView
+            android:id="@+id/user_id_item_certified"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/certified"
             android:layout_gravity="center_horizontal" />
 
     </LinearLayout>
@@ -39,21 +40,21 @@
         android:layout_weight="1">
 
         <TextView
-            android:id="@+id/address"
+            android:id="@+id/user_id_item_address"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="alice@example.com"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
-            android:id="@+id/userId"
+            android:id="@+id/user_id_item_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Alice"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
-            android:id="@+id/comment"
+            android:id="@+id/user_id_item_comment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/tertiary_text_light"
@@ -63,11 +64,20 @@
     </LinearLayout>
 
     <ImageView
-        android:id="@+id/edit_image"
+        android:id="@+id/user_id_item_edit_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:src="@drawable/ic_action_edit"
         android:padding="8dp"
         android:layout_gravity="center_horizontal" />
 
+    <ImageButton
+        android:id="@+id/user_id_item_delete_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:padding="8dp"
+        android:src="@drawable/ic_action_cancel"
+        android:layout_gravity="center_vertical"
+        style="@style/SelectableItem" />
+
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 432c8bfc9..f4738f1da 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -310,9 +310,9 @@
     <string name="progress_modify">modifying keyring…</string>
 
     <string name="progress_modify_unlock">unlocking keyring…</string>
-    <string name="progress_modify_adduid">adding user ids…</string>
-    <string name="progress_modify_revokeuid">revoking user ids…</string>
-    <string name="progress_modify_primaryuid">changing primary user id…</string>
+    <string name="progress_modify_adduid">adding user IDs…</string>
+    <string name="progress_modify_revokeuid">revoking user IDs…</string>
+    <string name="progress_modify_primaryuid">changing primary user ID…</string>
     <string name="progress_modify_subkeychange">modifying subkeys…</string>
     <string name="progress_modify_subkeyrevoke">revoking subkeys…</string>
     <string name="progress_modify_subkeyadd">adding subkeys…</string>