From 2a1a92f9073213dc03c72fbbcd806a98591ab7fa Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Mon, 12 May 2014 13:26:11 +0200
Subject: [PATCH] Dont show error popup on pgp decrypt error

---
 src/js/dao/email-dao.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/js/dao/email-dao.js b/src/js/dao/email-dao.js
index 5bbff8a..4cf73ed 100644
--- a/src/js/dao/email-dao.js
+++ b/src/js/dao/email-dao.js
@@ -414,10 +414,8 @@ define(function(require) {
             var encryptedNode = self._emailSync.filterBodyParts(message.bodyParts, 'encrypted')[0];
             self._crypto.decrypt(encryptedNode.content, senderPublicKey.publicKey, function(err, decrypted) {
                 if (err || !decrypted) {
-                    err = err || {
-                        errMsg: 'Error occurred during decryption'
-                    };
-                    done(err);
+                    message.body = err.errMsg || err.message;
+                    done();
                     return;
                 }