Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -N -r8104 -r8397
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 8104)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 8397)
@@ -867,38 +867,13 @@
         $ado->Execute($sql);
     }
 
+    /**
+     * Depricated
+     *
+     */
     function SendMailQeue()
     {
-        global $objConfig, $objSession, $TotalMessagesSent;
-
-        $ado = &GetADODBConnection();
-        $MaxAllowed = $this->MessagesAtOnce;
-
-        $del_sql = array();
-
-        $NumToSend = $MaxAllowed - $this->MessagesSent;
-        if($NumToSend < 0) $NumToSend=1;	// Don't really know why, but this could happend, so issued this temp fix
-        $sql = "SELECT * FROM ".$this->SourceTable." ORDER BY queued ASC LIMIT $NumToSend";
-        $rs = $ado->Execute($sql);
-
-        while($rs && !$rs->EOF)
-        {
-            $data = $rs->fields;
-						$this->DeliverMail($data["toaddr"],$data["fromaddr"],$data["Subject"],$data["message"],$data["headers"],1);
-
-            $del_sql[] = "DELETE FROM ".$this->SourceTable." WHERE queued='".$data["queued"]."'";
-            $rs->MoveNext();
-        }
-
-        $numdel = count($del_sql);
-        for($i=0;$i<$numdel;$i++)
-        {
-            $sql = $del_sql[$i];
-            if(strlen($sql))
-            $ado->Execute($sql);
-            if($objSession->HasSystemPermission("DEBUG.ITEM"))
-                echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
-        }
+    	return ;
     }
 
     function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, $SendEvent,$FileName="",$FileLoc="",$QueueOnly=0,$extra_headers = array())
@@ -931,7 +906,7 @@
 			$esender->AddAttachment($FileLoc, basename($FileName));
 		}
 
-		$status = $esender->Deliver();
+		$status = $esender->Deliver(null, $QueueOnly ? false : true);
 
 		if ($status) {
 			// write to log