From 4cb7d5309746a367f889c4a030c6232736554ef4 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Wed, 19 Jul 2017 18:16:41 +0200
Subject: Simplify outgoing encryption in PersonalizedDelivery.

---
 src/mailman_pgp/mta/personalized.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mailman_pgp/mta/personalized.py b/src/mailman_pgp/mta/personalized.py
index 2b6d228..c2c9a15 100644
--- a/src/mailman_pgp/mta/personalized.py
+++ b/src/mailman_pgp/mta/personalized.py
@@ -29,6 +29,8 @@ from mailman_pgp.utils.email import overwrite_message
 
 
 class PGPIndividualMixin:
+    """"""
+
     def sign_encrypt(self, mlist, msg, msgdata):
         """
 
@@ -57,18 +59,16 @@ class PGPIndividualMixin:
 
         key = pgp_address.key
         wrapped = MIMEWrapper(msg)
-        out = msg
+
         if pgp_list.sign_outgoing:
             if pgp_list.encrypt_outgoing:
                 out = wrapped.sign_encrypt(pgp_list.key, key, pgp_list.pubkey)
             else:
                 out = wrapped.sign(pgp_list.key)
         else:
-            if pgp_list.encrypt_outgoing:
-                out = wrapped.encrypt(key, pgp_list.pubkey)
+            out = wrapped.encrypt(key, pgp_list.pubkey)
 
-        if out is not msg:
-            overwrite_message(out, msg)
+        overwrite_message(out, msg)
 
 
 @public
-- 
cgit v1.2.3-70-g09d2