Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r309 -r313
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 309)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 313)
@@ -177,7 +177,8 @@
           {          
               $FromName = $objConfig->Get("Site_Name");
               $FromAddr = $objConfig->Get("Smtp_AdminMailFrom"); 
-          }          
+          } 
+                   
           $charset = "ascii-us";
           if($this->Get("MessageType")=="html")
           {
@@ -190,10 +191,10 @@
                 $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
           }
           
-          $time = time();
+          /*$time = time();
           
           $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To', '$subject', $time, '')";
-          $conn->Execute($sql);          
+          $conn->Execute($sql);   */       
           
           return TRUE;
         }
@@ -211,7 +212,7 @@
         //echo "<PRE>";print_r($this->recipient); echo "</PRE>";
         $this->recipient->TagPrefix="touser";
         if($this->recipient->Get("PortalUserId")==$UserId)
-        {        
+        {  
           $to_addr = $this->recipient->Get("Email");
           $To = trim($this->recipient->Get("FirstName")." ".$this->recipient->Get("LastName"));
 
@@ -250,10 +251,10 @@
                 $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
             }
             
-            $time = time();
+            /*$time = time();
             
 	        $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')";
-	        $conn->Execute($sql);                          
+	        $conn->Execute($sql);  */	                
             
             return TRUE;
         }
@@ -264,6 +265,8 @@
     {
         global $objUsers, $objConfig, $objEmailQueue;
 
+        $conn = GetADODBConnection();
+        
         $this->recipient = $objUsers->GetUser($this->Get("FromUserId"));
         $this->recipient->TagPrefix="touser";
         if($this->recipient->Get("PortalUserId")==$this->Get("FromUserId"))
@@ -289,6 +292,12 @@
               	$body = str_replace("<br />","\n",$body);
                 $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
               }
+              
+             /* $time = time();
+              
+	          $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')";
+	          $conn->Execute($sql);               
+              */
               return TRUE;
             }
         }
@@ -831,6 +840,12 @@
 		$f = "\"$FromName\" <".$From.">";		
 		$headers = "From: $f\n";
 		$headers .= "MIME-Version: 1.0\n";
+		
+        $conn = GetADODBConnection();
+		$time = time();
+              
+	    $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$ToName ($ToAddr)', '$Subject', $time, '')";
+	    $conn->Execute($sql); 		
         
 		if($HasFile)
 		{