M listfix.py → listfix.py

@@ -33,19 +33,18 @@ sender_name = email_in.get_sender_name()
 
     sender_email = sender_email.lower()
 
+    if (sender_email not in list_recipients):
+        log.info(f"Email dropped: sender {sender_email} not a member of list {list_email}.")
+        exit()
+
     log.info(f"Email from: {sender_email}")
     log.info(f"Email list: {list_email}")
 
     email_out = Email(email_in.get_content())
     email_out.strip_headers(exclude = ["To", "Cc", "Subject", "Content-[^:]+", "MIME-Version"])
-    if (sender_email not in list_recipients):
-        email_out.add_header_prepend(f"Reply-To: {list_email}, {sender_email}")
-    else:
-        email_out.add_header_prepend(f"Reply-To: {list_email}")
+    email_out.add_header_prepend(f"Reply-To: {list_email}")
     email_out.add_header_prepend(f"From: \"{sender_name} via {list_name}\" <{list_email}>")
-
-    if sender_email in list_recipients:
-        list_recipients.remove(sender_email)
+    list_recipients.remove(sender_email)
 
     for r in list_recipients:
         log.info(f"Recipient: {r}")