--- lib/Horde/Crypt/pgp.php.old 2007-11-30 18:43:22.000000000 +0100
+++ lib/Horde/Crypt/pgp.php     2007-11-30 20:55:06.000000000 +0100
@@ -702,13 +702,15 @@
                                 $timeout = PGP_KEYSERVER_TIMEOUT)
     {
         /* Get the 8 character fingerprint string. */
-        if (strpos($fprint, '0x') === 0) {
-            $fprint = substr($fprint, 2);
+        if (strpos($fprint, '@') < 0) {
+               if (strpos($fprint, '0x') === 0) {
+               $fprint = substr($fprint, 2);
+               }
+               if (strlen($fprint) > 8) {
+               $fprint = substr($fprint, 8);
+               }
+               $fprint = '0x' . $fprint;
         }
-        if (strlen($fprint) > 8) {
-            $fprint = substr($fprint, 8);
-        }
-        $fprint = '0x' . $fprint;
 
         /* Connect to the public keyserver. */