diff --git a/src/freedombone-utils-gpg b/src/freedombone-utils-gpg
index bb1d39a6e08e425189d9ed89437de39f6206f0d5..83968def0a165c5e6084f57587efa7f3a4ad63ed 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 c369bc3e6f3f09d45140dc4e120c00b2bbdfb61c..ee5e9c1d21e08868094c77559a6231d0dc0c398d 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