diff --git a/Rocksolid_Light/rslight/scripts/interBBS_mail.php b/Rocksolid_Light/rslight/scripts/interBBS_mail.php
index 0be0924..1573d7e 100644
--- a/Rocksolid_Light/rslight/scripts/interBBS_mail.php
+++ b/Rocksolid_Light/rslight/scripts/interBBS_mail.php
@@ -473,7 +473,8 @@ function send_keys_to_group($res, $rslight_gpg) {
         
     $body='';
     $body.="You may use this to import the public key for $domain.\n";
-    $body.="This message is automatically generated by $from.\n\n";
+    $body.="This message is automatically generated by $from.\n";
+    $body.="for inter-bbs mail exchange for Rocksolid Light.\n\n";
     
     $body.="This message was signed using the following key:\n";
     $body.="$signing_key\n\n";
diff --git a/Rocksolid_Light/spoolnews/mail.php b/Rocksolid_Light/spoolnews/mail.php
index def3118..80a8e1b 100644
--- a/Rocksolid_Light/spoolnews/mail.php
+++ b/Rocksolid_Light/spoolnews/mail.php
@@ -336,7 +336,7 @@ echo '</table>';
         // Get target domain (then get key if necessary)
         $info = preg_split('/@/', $recipient, 2);
         $target['domain'] = $info[1];
-        if(gnupg_keyinfo($res, $target['domain']) == false) { // We don't have the key
+        if(gnupg_keyinfo($res, "rslight@".$target['domain']) == false) { // We don't have the key
             $retrieve = retrieve_key($res, $target['domain']);
             if($retrieve == false) { // We can't get the key
                 return false;
@@ -350,7 +350,7 @@ echo '</table>';
         gnupg_addsignkey($res,$fingerprint_clean);
         gnupg_adddecryptkey($res,$fingerprint_clean, '');
         
-        $keyinfo = gnupg_keyinfo($res, $target['domain']);
+        $keyinfo = gnupg_keyinfo($res, "rslight@".$target['domain']);
         $target['fingerprint'] = $keyinfo[0]['subkeys'][0]['fingerprint'];
         $encrypt_to_key = $target['fingerprint'];
         gnupg_addencryptkey($res,$encrypt_to_key);