From c85ddcb63d17fb27075d0163f0bd0036182272cc Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 24 Jun 2017 18:48:33 +0100
Subject: [PATCH] Email install sequence

---
 src/freedombone-utils-gpg   | 2 ++
 src/freedombone-utils-setup | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/freedombone-utils-gpg b/src/freedombone-utils-gpg
index bb1d39a6..83968def 100755
--- a/src/freedombone-utils-gpg
+++ b/src/freedombone-utils-gpg
@@ -39,6 +39,8 @@ function gpg_update_mutt {
     CURR_GPG_ID=$(gpg --homedir=/home/$key_username/.gnupg --list-keys $CURR_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
 
     sed -i "s|set pgp_encrypt_only_command.*|set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --trust-model always --encrypt-to $CURR_GPG_ID -- -r %r -- %f\"|g" /home/$key_username/.muttrc
+    sed -i "s|set pgp_encrypt_sign_command.*|set pgp_encrypt_sign_command=\"/usr/lib/mutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --trust-model always --encrypt-to $CURR_GPG_ID -- -r %r -- %f\"|g" /home/$key_username/.muttrc
+
     chown $key_username:$key_username /home/$key_username/.muttrc
 }
 
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index c369bc3e..ee5e9c1d 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -917,15 +917,15 @@ function setup_email {
     #function_check install_monkeysphere
     #install_monkeysphere
 
+    function_check email_client
+    email_client
+
     function_check encrypt_incoming_email
     encrypt_incoming_email
 
     function_check encrypt_outgoing_email
     encrypt_outgoing_email
 
-    function_check email_client
-    email_client
-
     function_check email_archiving
     email_archiving