From ff28ef9dc1f39007b3fa69b870ba52a8f9bac4ad Mon Sep 17 00:00:00 2001
From: david nicol <david.nicol@plainblack.com>
Date: Thu, 23 Feb 2012 17:27:14 -0600
Subject: [PATCH] #13787 issue -- and general core repair

---
 lib/WebGUI/Mail/Send.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/WebGUI/Mail/Send.pm b/lib/WebGUI/Mail/Send.pm
index b12386df0..4418aaeb3 100644
--- a/lib/WebGUI/Mail/Send.pm
+++ b/lib/WebGUI/Mail/Send.pm
@@ -343,7 +343,14 @@ sub create {
 			}	
 		}
 	}
-    my $from    = $headers->{from}        || $session->setting->get('companyName') . " <".$session->setting->get("companyEmail").">";
+    my $from    = $headers->{from};
+    $from ||= do {
+        my $CoNa = $session->setting->get('companyName');
+        my $CoEm = $session->setting->get("companyEmail");
+        $CoNa =~ s/"//g;
+        qq{"$CoNa" <$CoEm>}
+    };
+
 	my $type    = $headers->{contentType} || "multipart/mixed";
     my $replyTo = $headers->{replyTo}     || $session->setting->get("mailReturnPath");