Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r315 -r361
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 315)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 361)
@@ -182,13 +182,13 @@
           $charset = "ascii-us";
           if($this->Get("MessageType")=="html")
           {
-              $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,NULL,$this->headers);
+              $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset, $this->Get("Event"),NULL,$this->headers);
           }
           else
           {
             	$body = nl2br($body);
             	$body = str_replace("<br />","\n",$body);
-                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
+                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
           }
           
           /*$time = time();
@@ -238,17 +238,17 @@
             $FromName = $objConfig->Get("Site_Name");
             $FromAddr = $objConfig->Get("Smtp_AdminMailFrom"); 
           }
+          echo $this->Event;
           
-          
             if($this->Get("MessageType")=="html")
             {
-                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,NULL,$this->headers);
+                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset, $this->Get("Event"),NULL,$this->headers);
             }
             else
             {
             	$body =  nl2br($body);
             	$body = str_replace("<br />","\n",$body);
-                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
+                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
             }
             
             /*$time = time();
@@ -284,13 +284,13 @@
               $charset = "ascii-us";
               if($this->Get("MessageType")=="html")
               {
-                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,NULL,$this->headers);
+                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,$this->Get("Event"),NULL,$this->headers);
               }
               else
               {
               	$body=nl2br($body); 
               	$body = str_replace("<br />","\n",$body);
-                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
+                $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
               }
               
              /* $time = time();
@@ -830,7 +830,7 @@
         }
     }
     
-   function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, 
+   function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, $SendEvent, 
                      $FileName="",$FileLoc="",$QueueOnly=0,$extra_headers = array())
    {
    		$HasFile = FALSE;
@@ -843,8 +843,17 @@
 		
         $conn = GetADODBConnection();
 		$time = time();
+		
+		$sendTo  = $ToName;
+		
+		if (strlen($sendTo) > 0) {
+			$sendTo .= "($ToAddr)";
+		}
+		else {
+			$sendTo = $ToAddr;
+		}
               
-	    $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$ToName ($ToAddr)', '$Subject', $time, '')";
+	    $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$sendTo', '$Subject', $time, '$SendEvent')";
 	    $conn->Execute($sql); 		
         
 		if($HasFile)