remove messages from cache before throwing if the prekey id could not be verified

libtextsecure/message_receiver.js

@@ -731,11 +731,16 @@ MessageReceiver.prototype.extend({
         window.log.info('prekey message from', this.getEnvelopeId(envelope));
         promise = captureActiveSession(sessionCipher)
           .then(async () => {
-            const buffer = dcodeIO.ByteBuffer.wrap(ciphertext);
+            try {
-            await window.libloki.storage.verifyFriendRequestAcceptPreKey(
+              const buffer = dcodeIO.ByteBuffer.wrap(ciphertext);
-              envelope.source,
+              await window.libloki.storage.verifyFriendRequestAcceptPreKey(
-              buffer
+                envelope.source,
-            );
+                buffer
+              );
+            } catch (e) {
+              await this.removeFromCache(envelope);
+              throw e;
+            }
             return this.decryptPreKeyWhisperMessage(
               ciphertext,
               sessionCipher,