Changeset 3363 in products

Timestamp:

Feb 28, 2012 9:31:13 AM (12 years ago)

Author:

fenix

Message:

removed explicit override of mail from address

File:

• Products.MailHost/trunk/src/Products/MailHost/MailHost.py (modified) (1 diff)

Products.MailHost/trunk/src/Products/MailHost/MailHost.py

@@ -451 +451 @@
 
     if mfrom:
-        # XXX: do we really want to override an explicitly set From
-        # header in the messageText
-        del mo['From']
-        mo['From'] = _encode_address_string(mfrom, charset)
+        if not mo['From']:
+            mo['From'] = _encode_address_string(mfrom, charset)
     else:
         if mo.get('From') is None: