From d993b213a72f7205fe1a5bb24b5903fb04cced70 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 1 Nov 2022 19:24:05 +0100
Subject: [PATCH] Revert more changes of #600

---
 dev/Stores/User/Pgp.js | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/dev/Stores/User/Pgp.js b/dev/Stores/User/Pgp.js
index 7a89ed2e3..8ba92bffd 100644
--- a/dev/Stores/User/Pgp.js
+++ b/dev/Stores/User/Pgp.js
@@ -133,31 +133,21 @@ export const
 
 		async decrypt(message) {
 			const sender = message.from[0].email,
-				armoredText = message.plain(),
-				emails = [...message.from,...message.to,...message.cc].validUnique();
+				armoredText = message.plain();
 			if (!this.isEncrypted(armoredText)) {
 				throw Error('Not armored text');
 			}
 
 			// Try OpenPGP.js
-			let email = emails.find(email => {
-				let result = OpenPGPUserStore.getPrivateKeyFor(email.email);
-				if (result) {
-					console.log('Trying decrypt with '+result.id+' of '+email.email);
-				}
+			let result = await OpenPGPUserStore.decrypt(armoredText, sender);
+			if (result) {
 				return result;
-			});
-			if (email) {
-				let result = await OpenPGPUserStore.decrypt(armoredText, sender);
-				if (result) {
-					return result;
-				}
-				console.error('OpenPGP decrypt failed');
 			}
 
 			// Try Mailvelope (does not support inline images)
 			try {
-				let i = emails.length;
+				let emails = [...message.from,...message.to,...message.cc].validUnique(),
+					i = emails.length;
 				while (i--) {
 					if (await this.getMailvelopePrivateKeyFor(emails[i].email)) {
 						/**