diff --git a/lib/Horde/Crypt/Pgp/Keyserver.php b/lib/Horde/Crypt/Pgp/Keyserver.php
index 9034096..e0d6134 100644
--- a/lib/Horde/Crypt/Pgp/Keyserver.php
+++ b/lib/Horde/Crypt/Pgp/Keyserver.php
@@ -175,7 +175,12 @@ public function getKeyId($address)
                 if (strpos($response->getHeader('Content-Type'), 'text/plain') !== 0) {
                     continue;
                 }
-                $output = $response->getBody();
+                $body = $response->getBody();
+                if (urlencode(urldecode($body)) === $body) {
+                    $output = urldecode($body);
+                } else {
+                    $output = $body;
+                }
             } catch (Horde_Http_Exception $e) {
                 throw new Horde_Crypt_Exception($e);
             }