diff --git a/README.md b/README.md
index 174a120..78b7d9a 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Bugs and feedback: https://github.com/barrydegraaff/pgp-zimlet/issues
     su zimbra
     cd /tmp
     rm tk_barrydegraaff_zimbra_openpgp*
-    wget https://github.com/barrydegraaff/pgp-zimlet-binaries/raw/master/1.4.6/tk_barrydegraaff_zimbra_openpgp.zip
+    wget https://github.com/barrydegraaff/pgp-zimlet-binaries/raw/master/1.4.7/tk_barrydegraaff_zimbra_openpgp.zip
     zmzimletctl deploy tk_barrydegraaff_zimbra_openpgp.zip
     (wait 15 minutes for the deploy to propagate; or zmprov fc all)
 
diff --git a/conf.mk b/conf.mk
index 0e9ce21..f665def 100644
--- a/conf.mk
+++ b/conf.mk
@@ -1,4 +1,4 @@
-VERSION=1.4.6
+VERSION=1.4.7
 PACKAGE=zcs-openpgp
 MAINTAINER=Barry de Graaff <info@barrydegraaff.tk>
 SECTION=free/zcs-mail
diff --git a/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.js b/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.js
index ccd576e..8ab35d6 100644
--- a/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.js
+++ b/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.js
@@ -934,6 +934,15 @@ function() {
          addresses=addresses + pubKeySelect.options[k].label + '; ';
       }   
    }
+
+   if (pubKeys.length < 1)
+   {
+      this._dialog.setButtonVisible(DwtDialog.CANCEL_BUTTON, true);
+      this._dialog.setButtonVisible(DwtDialog.OK_BUTTON, true);
+      document.getElementById("message").style.backgroundImage = "url('')";
+      tk_barrydegraaff_zimbra_openpgp.prototype.status("Please select recipient(s).", ZmStatusView.LEVEL_WARNING);
+      return;
+   }   
    
    var privateKeyInput = document.getElementById("privateKeyInput").value;
 
@@ -985,14 +994,7 @@ function() {
             myWindow._dialog.setButtonVisible(DwtDialog.CANCEL_BUTTON, true);
             myWindow._dialog.setButtonVisible(DwtDialog.OK_BUTTON, true);
             document.getElementById("message").style.backgroundImage = "url('')";
-            if( pubKeySelect.selectedOptions.length==0)
-            {
-               tk_barrydegraaff_zimbra_openpgp.prototype.status("Please select recipient(s).", ZmStatusView.LEVEL_WARNING);
-            }
-            else
-            {
-               tk_barrydegraaff_zimbra_openpgp.prototype.status("Could not encrypt message!", ZmStatusView.LEVEL_WARNING);
-            }
+            tk_barrydegraaff_zimbra_openpgp.prototype.status("Could not encrypt message!", ZmStatusView.LEVEL_WARNING);
         });      
    }
    else
diff --git a/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.xml b/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.xml
index 0a844c0..a509f73 100644
--- a/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.xml
+++ b/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.xml
@@ -1,4 +1,4 @@
-<zimlet name="tk_barrydegraaff_zimbra_openpgp" version="1.4.6" label="OpenPGP" description="Encrypt/Decrypt messages with OpenPGP">
+<zimlet name="tk_barrydegraaff_zimbra_openpgp" version="1.4.7" label="OpenPGP" description="Encrypt/Decrypt messages with OpenPGP">
    <summary>
 Zimbra OpenPGP Zimlet