do not encrypt if alias disables PGP

2020-05-16 18:20:26 +02:00 · 2020-05-16 18:20:26 +02:00 · f35b9e7542
parent 13bb9810b6
commit f35b9e7542
1 changed files with 1 additions and 1 deletions
--- a/email_handler.py
+++ b/email_handler.py
@ -389,7 +389,7 @@ def forward_email_to_mailbox(
        return False, "550 SL E1"

    # create PGP email if needed
-    if mailbox.pgp_finger_print and user.is_premium():
+    if mailbox.pgp_finger_print and user.is_premium() and not alias.disable_pgp:
        LOG.d("Encrypt message using mailbox %s", mailbox)
        msg = prepare_pgp_message(msg, mailbox.pgp_finger_print)