From d384f2407afc668b80d29ce8a8148860f8465198 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 26 May 2015 15:25:54 +0000
Subject: [PATCH] fix replies to encrypted mails dont open with encryption
 switched on

---
 mail/js/app.js                | 4 ++--
 phpgwapi/js/jsapi/app_base.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index d808d1ee3a..76a83feb05 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4263,7 +4263,7 @@ app.classes.mail = AppJS.extend(
 								.removeClass('mailCompose_copyEmail')
 								.css('cursor','move');
 					}
-					
+
 					var dragItems = jQuery('div.ms-sel-item');
 					dragItems.each(function(i,item){
 						var $isErr = jQuery(item).find('.ui-state-error');
@@ -4457,7 +4457,7 @@ app.classes.mail = AppJS.extend(
 				};
 				// set encrypted checkbox, if not already set
 				var composeToolbar = this.et2.getWidgetById('composeToolbar');
-				if (composeToolbar.checkbox('pgp'))
+				if (!composeToolbar.checkbox('pgp'))
 				{
 					composeToolbar.checkbox('pgp',true);
 				}
diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 67943d6e83..5e427afe7c 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -865,7 +865,7 @@ var AppJS = Class.extend(
 		{
 			jQuery(window).on('mailvelope', function()
 			{
-				self.mailvelopeOpenKeyring.then(callback);
+				self.mailvelopeOpenKeyring().then(callback);
 			});
 		}
 	},