diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdKeyActivity.java
index 0ee5b2936..53c335696 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectIdKeyActivity.java
@@ -444,12 +444,14 @@ public class RemoteSelectIdKeyActivity extends FragmentActivity {
         void bind(KeyInfo keyInfo, Drawable selectionIcon) {
             Context context = vCreation.getContext();
 
+            String email = keyInfo.getEmail();
             String name = keyInfo.getName();
-            if (name != null) {
+            if (email != null) {
+                vName.setText(context.getString(R.string.use_key, email));
+            } else if (name != null) {
                 vName.setText(context.getString(R.string.use_key, name));
             } else {
-                String email = keyInfo.getEmail();
-                vName.setText(context.getString(R.string.use_key, email));
+                vName.setText(context.getString(R.string.use_key_no_name));
             }
 
             String dateTime = DateUtils.formatDateTime(context, keyInfo.getCreationDate(),
diff --git a/OpenKeychain/src/main/res/layout/api_select_identity_item.xml b/OpenKeychain/src/main/res/layout/api_select_identity_item.xml
index 7dfcac1b6..78001af3c 100644
--- a/OpenKeychain/src/main/res/layout/api_select_identity_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_select_identity_item.xml
@@ -30,6 +30,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
+            android:maxLines="1"
+            android:ellipsize="end"
             tools:text="Use key: look@my.amazin.horse"
             />