diff --git a/libloki/proof-of-work.js b/libloki/proof-of-work.js
index 3adab32b2..2b4579d32 100644
--- a/libloki/proof-of-work.js
+++ b/libloki/proof-of-work.js
@@ -4,7 +4,7 @@ const { BigInteger } = require('jsbn');
 
 const NONCE_LEN = 8;
 // Modify this value for difficulty scaling
-const NONCE_TRIALS = 1000;
+const NONCE_TRIALS = 10;
 
 // Increment Uint8Array nonce by 1 with carrying
 function incrementNonce(nonce) {
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 1d3da3f16..f7d14f071 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -541,7 +541,7 @@ MessageReceiver.prototype.extend({
     return textsecure.storage.unprocessed.add(data);
   },
   async updateCache(envelope, plaintext) {
-    const { id } = envelope;
+    const { id, preKeyBundleMessage } = envelope;
     const item = await textsecure.storage.unprocessed.get(id);
     if (!item) {
       window.log.error(
@@ -556,6 +556,7 @@ MessageReceiver.prototype.extend({
         sourceDevice: envelope.sourceDevice,
         serverTimestamp: envelope.serverTimestamp,
         decrypted: await MessageReceiver.arrayBufferToStringBase64(plaintext),
+        preKeyBundleMessage: await MessageReceiver.arrayBufferToStringBase64(preKeyBundleMessage),
       });
     } else {
       item.set({
@@ -563,6 +564,7 @@ MessageReceiver.prototype.extend({
         sourceDevice: envelope.sourceDevice,
         serverTimestamp: envelope.serverTimestamp,
         decrypted: await MessageReceiver.arrayBufferToString(plaintext),
+        preKeyBundleMessage: await MessageReceiver.arrayBufferToStringBase64(preKeyBundleMessage),
       });
     }
 
@@ -713,18 +715,11 @@ MessageReceiver.prototype.extend({
 
     // Check if we have preKey bundles to decrypt
     if (envelope.preKeyBundleMessage) {
-      const decryptedText = await fallBackSessionCipher.decrypt(envelope.preKeyBundleMessage);
+      const decryptedText = await fallBackSessionCipher.decrypt(envelope.preKeyBundleMessage.toArrayBuffer());
+      const unpadded = await this.unpad(decryptedText);
 
-      // Convert the decryptedText to an array buffer if we have a string
-      if (typeof decryptedText === 'string') {
-        // eslint-disable-next-line no-param-reassign
-        envelope.preKeyBundleMessage = await MessageReceiver.stringToArrayBuffer(
-          decryptedText
-        );
-      } else {
-        // eslint-disable-next-line no-param-reassign
-        envelope.preKeyBundleMessage = decryptedText;
-      }
+      // eslint-disable-next-line no-param-reassign
+      envelope.preKeyBundleMessage = unpadded;
 
       // Save the preKey bundle if this is not a friend request.
       // We don't automatically save on a friend request because
@@ -1051,6 +1046,12 @@ MessageReceiver.prototype.extend({
   },
   async innerHandleContentMessage(envelope, plaintext) {
     const content = textsecure.protobuf.Content.decode(plaintext);
+    const preKeyBundleMessage = envelope.preKeyBundleMessage && textsecure.protobuf.PreKeyBundleMessage.decode(envelope.preKeyBundleMessage);
+
+    // Set the decoded preKeyMessage
+    if (preKeyBundleMessage) {
+      envelope.preKeyBundleMessage = preKeyBundleMessage;
+    }
 
     let conversation;
     try {