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");