Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -N -r2899 -r3056
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 2899)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 3056)
@@ -238,7 +238,7 @@
             $FromName = $objConfig->Get("Site_Name");
             $FromAddr = $objConfig->Get("Smtp_AdminMailFrom"); 
           }
-          echo $this->Event;
+//          echo $this->Event;
           
             if($this->Get("MessageType")=="html")
             {
@@ -282,7 +282,7 @@
             
             $subject = $this->ParseSection($this->subject);            
             $body = $this->ParseSection($this->body);                       
-            $FromName = "System Event";
+           	$FromName = $objConfig->Get("Site_Name");
             $FromAddr = $objConfig->Get("Smtp_AdminMailFrom"); 
             if(strlen($FromAddr))
             {            
Index: trunk/admin/email/do_send.php
===================================================================
diff -u -N -r2853 -r3056
--- trunk/admin/email/do_send.php	(.../do_send.php)	(revision 2853)
+++ trunk/admin/email/do_send.php	(.../do_send.php)	(revision 3056)
@@ -56,7 +56,7 @@
 
 if(!strlen(trim($FromName)))
 {
-  $FromName = "System Administrator";
+  $FromName = $objConfig->Get("Site_Name");
 }
 
 $TargetURL = $_SERVER["PHP_SELF"]."?".$envar.'&destform=popup';