1 files changed, 7 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
index 80f52f914..5d281d5b0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
@@ -57,11 +57,13 @@ public class EmailKeyHelper {
             }
         }
 
-        // Most users don't have the SRV record, so ask a default server as well
-        String[] servers = Preferences.getPreferences(context).getKeyServers();
-        if (servers != null && servers.length != 0) {
-            HkpKeyserver hkp = new HkpKeyserver(servers[0]);
-            keys.addAll(getEmailKeys(mail, hkp));
+        if (keys.isEmpty()) {
+            // Most users don't have the SRV record, so ask a default server as well
+            String[] servers = Preferences.getPreferences(context).getKeyServers();
+            if (servers != null && servers.length != 0) {
+                HkpKeyserver hkp = new HkpKeyserver(servers[0]);
+                keys.addAll(getEmailKeys(mail, hkp));
+            }
         }
         return new ArrayList<ImportKeysListEntry>(keys);
     }