From ede293946c2ae49a7868e4513dd8c1325b3f898d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 02 Apr 2016 03:39:50 -0400
Subject: [PATCH] Merge branch 'attach-pgp-key' of https://github.com/guitarmanusa/roundcubemail-1 into guitarmanusa-attach-pgp-key

---
 plugins/enigma/config.inc.php.dist |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist
index 17e72de..57dfcad 100644
--- a/plugins/enigma/config.inc.php.dist
+++ b/plugins/enigma/config.inc.php.dist
@@ -19,12 +19,18 @@
 // Enables messages decryption feature.
 $config['enigma_decryption'] = true;
 
+// Enables messages encryption and signing feature.
+$config['enigma_encryption'] = true;
+
 // Enable signing all messages by default
 $config['enigma_sign_all'] = false;
 
 // Enable encrypting all messages by default
 $config['enigma_encrypt_all'] = false;
 
+// Enable signing all messages by default
+$config['enigma_attach_pubkey'] = false;
+
 // Default for how long to store private key passwords (in minutes).
 // When set to 0 passwords will be stored for the whole session.
 $config['enigma_password_time'] = 5;

--
Gitblit v1.9.1