diff --git a/internal_packages/keybase/lib/encrypt-button.cjsx b/internal_packages/keybase/lib/encrypt-button.cjsx
index 72c1c3710..dac9934dc 100755
--- a/internal_packages/keybase/lib/encrypt-button.cjsx
+++ b/internal_packages/keybase/lib/encrypt-button.cjsx
@@ -106,8 +106,10 @@ class EncryptMessageButton extends React.Component
       @_checkKeysAndEncrypt(plaintext, identities, (err, cryptotext) =>
         if err
           console.warn err
+          Actions.recordUserEvent("Email Encryption Errored", {error: err})
           NylasEnv.showErrorDialog(err)
         if cryptotext? and cryptotext != ""
+          Actions.recordUserEvent("Email Encrypted")
           # <pre> tag prevents gross HTML formatting in-flight
           cryptotext = "<pre>#{cryptotext}</pre>"
           @setState({
diff --git a/internal_packages/keybase/lib/pgp-key-store.cjsx b/internal_packages/keybase/lib/pgp-key-store.cjsx
index 50b3ec033..5275be350 100755
--- a/internal_packages/keybase/lib/pgp-key-store.cjsx
+++ b/internal_packages/keybase/lib/pgp-key-store.cjsx
@@ -415,6 +415,7 @@ class PGPKeyStore extends NylasStore
           errMsg = "Unable to decrypt message. Private key does not match encrypted block."
           if !@msgStatus(message)?
             errMsg = "Decryption preprocessing failed."
+        Actions.recordUserEvent("Email Decryption Errored", {error: errMsg})
         @_msgStatus.push({"clientId": message.clientId, "time": Date.now(), "message": errMsg})
       else
         if warnings._w.length > 0
@@ -436,6 +437,7 @@ class PGPKeyStore extends NylasStore
           keyprint = subkey.get_fingerprint().toString('hex')
           @_msgStatus.push({"clientId": message.clientId, "time": Date.now(), "message": "Message decrypted with key #{keyprint}"})
           # re-render messages
+          Actions.recordUserEvent("Email Decrypted")
           MessageBodyProcessor.resetCache()
           @trigger(@)
         else