Index: trunk/admin/email/do_send.php
===================================================================
diff -u -N -r7867 -r8397
--- trunk/admin/email/do_send.php	(.../do_send.php)	(revision 7867)
+++ trunk/admin/email/do_send.php	(.../do_send.php)	(revision 8397)
@@ -148,20 +148,22 @@
       $TargetURL .="&EmailState=email_send_progress&Start=0&Total=".count($UserList);
   break;
   case "email_send_progress":
-    $total = $_GET["Total"];
+    $application =& kApplication::Instance();
+    $application->RemoveVar('email_queue_progress');
+  	$application->Redirect('emails/send_queue', null, '', 'index.php');
+  	
+  	/*$total = $_GET["Total"];
     $start = $_GET["Start"];
-    if($start < $total)
-    {
+    if ($start < $total) {
       $pct = (int)(($start/$total)*100);
       $NewStart = $start+$MessagesPerPage;
       $TargetURL .= "&EmailState=email_send_progress&Start=$NewStart&Total=$total";
       $PageTitle = admin_language("la_Title_SendMailProgress")." - ".$pct."% ".admin_language("la_Text_Complete");
     }
-    else
-    {
+    else {
       $PageTitle = admin_language("la_Title_SendMailProgress");
       $TargetURL .= "&EmailState=email_send_complete";
-    }
+    }*/
   break;
   case "email_send_complete":
       $PageTitle = admin_language("la_Title_SendMailComplete");
@@ -207,11 +209,8 @@
       $o .= "<TD ALIGN=\"middle\" COLSPAN=2></TD></TR>";
       $o .= "</TABLE><input type=button CLASS=\"button\" VALUE=\"".admin_language("la_Cancel")."\" ONCLICK=\"document.location='".$CancelURL."';\">";
       echo $o."\n";
-
-      $sql = "CREATE TABLE $table SELECT * FROM ".$objEmailQueue->SourceTable." WHERE queued=99";
-      $ado->Execute($sql);
-      //echo $sql."<br>\n";
-      for($i=0;$i<count($UserList);$i++)
+      
+      for($i = 0; $i < count($UserList); $i++)
       {
            $ToAddr = $UserList[$i];
            //$From,$FromName,$To,$ToName,$Subject,$Text,$Html,$charset,$AttmFiles,$QueueOnly=0