Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v
diff -u -N -r1.54 -r1.55
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	14 Oct 2006 15:59:55 -0000	1.54
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	15 Oct 2006 07:21:04 -0000	1.55
@@ -1136,9 +1136,16 @@
             }
         }
 
-	set party_id($sender_addr) [party::get_by_email -email $sender_addr]
 	set party_id($from_addr) [party::get_by_email -email $from_addr]
-	set from_string "[party::name -email $sender_addr] <${sender_addr}>"
+	
+	# Deal with the sender address. Only change the from string if we find a party_id
+	# This should take care of anyone parsing in an email which is already formated with <>.
+	set party_id($sender_addr) [party::get_by_email -email $sender_addr]
+	if {[exists_and_not_null party_id($sender_addr)]} {
+	    set from_string "\"[party::name -email $sender_addr]\" <${sender_addr}>"
+	} else {
+	    set from_string $sender_addr
+	}
 
         # decision between normal or multipart/alternative body
         if { $alternative_part_p eq "0"} {
@@ -1376,7 +1383,8 @@
 	set bcc_party_ids $new_bcc_party_ids
 
 	# Rollout support (see above for details)
-	
+
+	ns_log Notice "acs-mail-lite:complex_send:: From String: $from_string"
 	set delivery_mode [ns_config ns/server/[ns_info server]/acs/acs-rollout-support EmailDeliveryMode] 
 	if {![empty_string_p $delivery_mode]
 	    && ![string equal $delivery_mode default]
Index: openacs-4/packages/notifications/tcl/notification-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	14 Oct 2006 18:22:01 -0000	1.25
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	15 Oct 2006 07:20:30 -0000	1.26
@@ -60,9 +60,9 @@
         {-type_id:required}
     } {
         if {[empty_string_p $object_id] || [empty_string_p $type_id]} {
-            return "[address_domain] mailer <[reply_address_prefix]@[address_domain]>"
+            return "\"[address_domain] mailer\" <[reply_address_prefix]@[address_domain]>"
         } else {
-            return "[address_domain] mailer <[reply_address_prefix]-$object_id-$type_id@[address_domain]>"
+            return "\"[address_domain] mailer\" <[reply_address_prefix]-$object_id-$type_id@[address_domain]>"
         }
     }