diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 1e4f8f0f4..2384e3995 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -69,6 +69,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
 
     private LoaderState mLoaderState;
     private List<ImportKeysListEntry> mData;
+    private boolean[] mDownloaded;
 
     public ImportKeysAdapter(FragmentActivity activity, ImportKeysListener listener, boolean mNonInteractive) {
         this.mActivity = activity;
@@ -82,11 +83,13 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
 
     public void setData(List<ImportKeysListEntry> data) {
         this.mData = data;
+        this.mDownloaded = new boolean[data.size()];
         notifyDataSetChanged();
     }
 
     public void clearData() {
         mData = null;
+        mDownloaded = null;
         notifyDataSetChanged();
     }
 
@@ -175,11 +178,11 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
         b.expand.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                boolean hidden = b.extraContainer.getVisibility() == View.GONE;
-                b.extraContainer.setVisibility(hidden ? View.VISIBLE : View.GONE);
-                b.expand.animate().rotation(hidden ? 180 : 0).start();
+                boolean downloaded =  mDownloaded[position] = !mDownloaded[position];
+                b.extraContainer.setVisibility(downloaded ? View.VISIBLE : View.GONE);
+                b.expand.animate().rotation(downloaded ? 180 : 0).start();
 
-                if (hidden) {
+                if (downloaded) {
                     if (mLoaderState instanceof BytesLoaderState) {
                         getKey(new ParcelableKeyRing(entry.getEncodedRing()));
                     } else if (mLoaderState instanceof CloudLoaderState) {
@@ -190,6 +193,9 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
             }
         });
 
+        b.extraContainer.setVisibility(mDownloaded[position] ? View.VISIBLE : View.GONE);
+        b.expand.setRotation(mDownloaded[position] ? 180 : 0);
+
         b.userIdsList.setVisibility(entry.getUserIds().size() == 1 ? View.GONE : View.VISIBLE);
         // destroyLoader view from holder
         b.userIdsList.removeAllViews();
@@ -302,7 +308,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
 
     @Override
     public void handleResult(ImportKeyResult result) {
-        boolean resultStatus = result.isOkBoth();
+        boolean resultStatus = result.success();
         Log.e(Constants.TAG, "getKey result: " + resultStatus);
         if (resultStatus) {
             ArrayList<CanonicalizedKeyRing> canKeyRings = result.mCanonicalizedKeyRings;
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
index ebe972382..29b44802d 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
@@ -87,7 +87,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true" />
+                        android:layout_centerVertical="true"
+                        android:visibility="@{revoked || expired ? View.VISIBLE : View.GONE}" />
 
                 </RelativeLayout>