summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/changes/feature_3878_add-preference-to-openpgp-header2
-rw-r--r--mail/src/leap/mail/smtp/gateway.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/mail/changes/feature_3878_add-preference-to-openpgp-header b/mail/changes/feature_3878_add-preference-to-openpgp-header
new file mode 100644
index 0000000..4513bf6
--- /dev/null
+++ b/mail/changes/feature_3878_add-preference-to-openpgp-header
@@ -0,0 +1,2 @@
+ o Add 'signencrypt' preference to OpenPGP header on outgoing email. Closes
+ #3878".
diff --git a/mail/src/leap/mail/smtp/gateway.py b/mail/src/leap/mail/smtp/gateway.py
index 523ac0d..a78bd55 100644
--- a/mail/src/leap/mail/smtp/gateway.py
+++ b/mail/src/leap/mail/smtp/gateway.py
@@ -683,6 +683,7 @@ class EncryptedMessage(object):
username, domain = signkey.address.split('@')
newmsg.add_header(
'OpenPGP', 'id=%s' % signkey.key_id,
- url='https://%s/key/%s' % (domain, username))
+ url='https://%s/key/%s' % (domain, username),
+ preference='signencrypt')
# delete user-agent from origmsg
del(origmsg['user-agent'])