DataObjects/Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index b8f119a..a582993 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -330,7 +330,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         $fh = fopen($cachePath, 'w');
 
         fwrite($fh, implode("\n", array(
-            "From: {t.messageFrom():h} ",
+            "From: {if:t.messageFrom}{t.messageFrom:h}{else:}{t.messageFrom():h}{end:}",
             "To: {if:t.person}{t.person.getEmailFrom():h}{else:}{foreach:rcpts,v}{v:h},{end:}{end:}",
             "Subject: {t.subject} ",
             "X-Message-ID: {t.id} "