diff --git a/lib/WebGUI/Inbox/Message.pm b/lib/WebGUI/Inbox/Message.pm
index 0b2d94db9..c0ae4c81b 100644
--- a/lib/WebGUI/Inbox/Message.pm
+++ b/lib/WebGUI/Inbox/Message.pm
@@ -118,7 +118,7 @@ sub create {
         $pref .= $session->db->quickScalar("SELECT username FROM users WHERE userid = ?",[$properties->{sentBy}]). ".";
 	    my $msg = (defined $properties->{emailMessage}) ? $properties->{emailMessage} : $self->{_properties}{message};
 		if ($msg =~ m/\<.*\>/) {
-			$mail->addHtml("<p>$pref</p><br>".$msg);
+			$mail->addHtml("<p>$pref</p><br />".$msg);
 		} else {
 			$mail->addText($pref."\n\n".$msg);
 		}
diff --git a/lib/WebGUI/Mail/Send.pm b/lib/WebGUI/Mail/Send.pm
index 228f62033..3d4ac0027 100644
--- a/lib/WebGUI/Mail/Send.pm
+++ b/lib/WebGUI/Mail/Send.pm
@@ -286,7 +286,7 @@ sub create {
 			}	
 		}
 	}
-    my $from    = $headers->{from} || $session->user->username." <".$session->setting->get("companyEmail").">";
+    my $from    = $headers->{from} || $session->setting->get('comanyName') . " <".$session->setting->get("companyEmail").">";
 	my $type    = $headers->{contentType} || "multipart/mixed";
     my $replyTo = $headers->{replyTo} ||  $session->setting->get("mailReturnPath");