diff --git a/util/daily-report.php b/util/daily-report.php
index cfc2cb7a..1aa80d12 100644
--- a/util/daily-report.php
+++ b/util/daily-report.php
@@ -3,11 +3,8 @@
 $webuidir = "";
 $verbose = 0;
 
-$archivesizeraw = $sqlsizeraw = $sphinxsizeraw = 0;
-$averagemessagesweekraw = $averagemessagesmonthraw = $averagemessagesizeraw = $averagesizedayraw = $averagesqlsizeraw = $averagesphinxsizeraw = 0;
-
 ini_set("session.save_path", "/tmp");
-   
+
 $_SERVER['HTTP_USER_AGENT'] = "daily/cron";
 
 $opts = 'h::v';
@@ -15,21 +12,21 @@ $lopts = array(
     'webui:',
     'verbose'
     );
-    
+
 if ( $options = getopt( $opts, $lopts ) )
 {
-    if ( isset($options['webui']) ) 
+    if ( isset($options['webui']) )
     {
         $webuidir = $options['webui'];
     } else
     {
         echo "\nError: must provide path to WebUI directory\n\n";
-    
+
         display_help();
         exit;
     }
-    
-    if ( isset($options['h']) ) 
+
+    if ( isset($options['h']) )
     {
         display_help();
         exit;
@@ -40,7 +37,7 @@ if ( $options = getopt( $opts, $lopts ) )
     }
 } else {
     display_help();
-    exit;   
+    exit;
 }
 
 
@@ -99,87 +96,30 @@ $counter = new ModelStatCounter();
 $mail = new ModelMailMail();
 
 
-      foreach (Registry::get('health_smtp_servers') as $smtp) {
-         $_health[] = $health->checksmtp($smtp, $text_error);
-      }
+$health->collect_data();
+$health = $health->data;
 
-      $processed_emails = $health->count_processed_emails();
 
-      list ($uptime, $cpuload) = $health->uptime();
+$msg = "From: " . SMTP_FROMADDR . EOL;
+$msg .= "To: " . ADMIN_EMAIL . EOL;
+$msg .= "Subject: =?UTF-8?Q?" . preg_replace("/\n/", "", my_qp_encode($text_daily_piler_report)) . "?=" . EOL;
+$msg .= "MIME-Version: 1.0" . EOL;
+$msg .= "Content-Type: text/html; charset=\"utf-8\"" . EOL;
+$msg .= EOL . EOL;
 
-      $x = exec(CPU_USAGE_COMMAND);
-      $cpuinfo = 100 - (int)$x;
+ob_start();
 
-      list($totalmem, $meminfo, $totalswap, $swapinfo) = $health->meminfo();
-      $shortdiskinfo = $health->diskinfo();
+include($webuidir . "/view/theme/default/templates/health/daily-report.tpl");
 
-      list($archivesizeraw, $archivesizestored, $counters) = $counter->get_counters();
+$msg .= ob_get_contents();
 
-      $archive_size = nice_size($archivesizeraw, ' ');
+ob_end_clean();
 
-      $sysinfo = $health->sysinfo();
+$rcpt = array(ADMIN_EMAIL);
 
-      $options = $health->get_options();
-
-      $averagemessagesizeraw = $averagesqlsizeraw = $averagesphinxsizeraw = $daysleftatcurrentrate = 0;
-
-	  /* these next counters are for projecting space */
-	  $averagemessagesweekraw = 0;
-	  $averagemessagesmonthraw = 0;
-
-          if($counters['rcvd'] > 0) {
-             $averagemessagesizeraw = $archivesizeraw / $counters['rcvd'];
-             $averagesqlsizeraw = $sqlsizeraw / $counters['rcvd'];
-             $averagesphinxsizeraw = $sphinxsizeraw / $counters['rcvd'];
-          }
-
-	  $averagesizedayraw = ($averagemessagesizeraw+$averagesqlsizeraw+$averagesphinxsizeraw) * $averagemessagesweekraw;
-          $datapart = 0;
-	  foreach($shortdiskinfo as $part) {
-		if( $part['partition'] == DATA_PARTITION ) { $datapart = $part['freespace']*1024; }
-	  }
-	  
-	  $averagemessages = round($averagemessagesweekraw);							// average of messages over the past week
-	  $averagemessagesize = nice_size($averagemessagesizeraw,' ');				// average message size on disk
-	  $averagesqlsize = nice_size($averagesqlsizeraw,' ');						// average metadata size in sql
-	  $averagesphinxsize = nice_size($averagesphinxsizeraw,' ');					// average sphinx index
-	  $averagesizeday = nice_size($averagesizedayraw,' ');						// average size per day
-
-	  if($averagesizedayraw > 0) {
-             $daysleftatcurrentrate = convert_days_ymd($datapart / $averagesizedayraw);	// number of days of free space left
-          }
-
-	  if ( $averagemessagesweekraw > $averagemessagesmonthraw ) {
-		$usagetrend = 1;
-	  } elseif( $averagemessagesweekraw < $averagemessagesmonthraw ) {
-	    $usagetrend = -1;
-	  } else {
-		$usagetrend = 0;
-	  }
-	  
-	  
-	  /* start email message */
-	  
-      $msg = "From: " . SMTP_FROMADDR . EOL;
-      $msg .= "To: " . ADMIN_EMAIL . EOL;
-      $msg .= "Subject: =?UTF-8?Q?" . preg_replace("/\n/", "", my_qp_encode($text_daily_piler_report)) . "?=" . EOL;
-      $msg .= "MIME-Version: 1.0" . EOL;
-      $msg .= "Content-Type: text/html; charset=\"utf-8\"" . EOL;
-      $msg .= EOL . EOL;
-
-      ob_start();
-	  
-      include($webuidir . "/view/theme/default/templates/health/daily-report.tpl");
-
-      $msg .= ob_get_contents();
-
-      ob_end_clean();
-
-      $rcpt = array(ADMIN_EMAIL);
-
-      if(SMARTHOST) {
-         $x = $mail->send_smtp_email(SMARTHOST, SMARTHOST_PORT, SMTP_DOMAIN, SMTP_FROMADDR, $rcpt, $msg);
-      }
+if(SMARTHOST) {
+   $x = $mail->send_smtp_email(SMARTHOST, SMARTHOST_PORT, SMTP_DOMAIN, SMTP_FROMADDR, $rcpt, $msg);
+}
 
 
 if($fp) {
diff --git a/webui/view/theme/default/templates/health/daily-report.tpl b/webui/view/theme/default/templates/health/daily-report.tpl
index 8bdf2f5d..068cb58b 100644
--- a/webui/view/theme/default/templates/health/daily-report.tpl
+++ b/webui/view/theme/default/templates/health/daily-report.tpl
@@ -32,28 +32,28 @@
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_server_name; ?>:</div>
-            <div class="cellhealthright"><?php print $sysinfo[0]; ?></div>
+            <div class="cellhealthright"><?php print $health['sysinfo'][0]; ?></div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_server_operating_system; ?>:</div>
-            <div class="cellhealthright"><?php print $sysinfo[1]; ?></div>
+            <div class="cellhealthright"><?php print $health['sysinfo'][1]; ?></div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_uptime; ?>:</div>
-            <div class="cellhealthright"><?php print $uptime; ?></div>
+            <div class="cellhealthright"><?php print $health['uptime']; ?></div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_archive_size_before_compression; ?>:</div>
-            <div class="cellhealthright"><?php print $archive_size; ?>B</div>
+            <div class="cellhealthright"><?php print $health['archive_size']; ?>B</div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_smtp_status; ?>:</div>
             <div class="cellhealthright">
-               <?php foreach($_health as $h) {
+               <?php foreach($health['health'] as $h) {
                         if(preg_match("/^220/", $h[1])) {
                            $status = 'OK'; $class = 'ok';
                         } else {
@@ -68,40 +68,40 @@
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_processed_emails; ?>:</div>
-            <div class="cellhealthright"><?php print $processed_emails['last_60_mins_count']; ?> (<?php print $text_60_minutes; ?>)<br /><?php print $processed_emails['today_count']; ?> (<?php print $text_24_hours; ?>)<br /><?php print $processed_emails['last_7_days_count']; ?> (<?php print $text_1_week; ?>)<br /><?php print $processed_emails['last_30_days_count']; ?> (<?php print $text_30_days; ?>)</div>
+            <div class="cellhealthright"><?php print $health['processed_emails']['last_60_mins_count']; ?> (<?php print $text_60_minutes; ?>)<br /><?php print $health['processed_emails']['today_count']; ?> (<?php print $text_24_hours; ?>)<br /><?php print $health['processed_emails']['last_7_days_count']; ?> (<?php print $text_1_week; ?>)<br /><?php print $health['processed_emails']['last_30_days_count']; ?> (<?php print $text_30_days; ?>)</div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_cpu_usage; ?>:</div>
-            <div class="cellhealthright"><span class="<?php if($cpuinfo < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $cpuinfo; ?>% <?php print $cpuload; ?></span></div>
+            <div class="cellhealthright"><span class="<?php if($health['cpuinfo'] < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $health['cpuinfo']; ?>% <?php print $health['cpuload']; ?></span></div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_memory_usage; ?>:</div>
-            <div class="cellhealthright"><span class="<?php if($meminfo < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $meminfo; ?>% / <?php print $totalmem; ?> MB</span></div>
+            <div class="cellhealthright"><span class="<?php if($health['meminfo'] < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $health['meminfo']; ?>% / <?php print $health['totalmem']; ?> MB</span></div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_swap_usage; ?></div>
-            <div class="cellhealthright"><span class="<?php if($swapinfo < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $swapinfo; ?>% / <?php print $totalswap; ?> MB</span></div>
+            <div class="cellhealthright"><span class="<?php if($health['swapinfo'] < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $health['swapinfo']; ?>% / <?php print $health['totalswap']; ?> MB</span></div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_disk_usage; ?></div>
-            <div class="cellhealthright"><?php foreach($shortdiskinfo as $partition) { ?><span class="<?php if($partition['utilization'] < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $partition['partition']; ?> <?php print $partition['utilization']; ?>%</span> <?php } ?></div>
+            <div class="cellhealthright"><?php foreach($health['shortdiskinfo'] as $partition) { ?><span class="<?php if($partition['utilization'] < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $partition['partition']; ?> <?php print $partition['utilization']; ?>%</span> <?php } ?></div>
          </div>
 
          <div class="row">
             <div class="cellhealthleft"><?php print $text_space_projection; ?></div>
             <div class="cellhealthright">
-				<?php print $averagemessages; ?> (<?php print $text_average_messages_day; ?>)<br/>
-				<?php print $averagemessagesize; ?> + <?php print $averagesqlsize; ?> + <?php print $averagesphinxsize; ?> (<?php print $text_average_message_size; ?>)<br/>
-				<?php print $averagesizeday; ?> (<?php print $text_average_size_day; ?>)<br/>
-				<?php print $daysleftatcurrentrate[0]; ?> years, <?php print $daysleftatcurrentrate[1]; ?> months, <?php print $daysleftatcurrentrate[2]; ?> days ("<?php print DATA_PARTITION; ?>" <?php print $text_partition_full; ?>)<br/>
-				<?php if ( $usagetrend > 0 ) { print $text_usage_increasing; } elseif( $usagetrend < 0 ) { print $text_usage_decreasing; } else { print $text_usage_neutral; } ?> (<?php print $text_usage_trend; ?>)<br/>
+               <?php print $health['averagemessages']; ?> (<?php print $text_average_messages_day; ?>)<br/>
+               <?php print $health['averagemessagesize']; ?> + <?php print $health['averagesqlsize']; ?> + <?php print $health['averagesphinxsize']; ?> (<?php print $text_average_message_size; ?>)<br/>
+               <?php print $health['averagesizeday']; ?> (<?php print $text_average_size_day; ?>)<br/>
+               <?php print $health['daysleftatcurrentrate'][0]; ?> years, <?php print $health['daysleftatcurrentrate'][1]; ?> months, <?php print $health['daysleftatcurrentrate'][2]; ?> days ("<?php print DATA_PARTITION; ?>" <?php print $text_partition_full; ?>)<br/>
+               <?php if ($health['usagetrend'] > 0) { print $text_usage_increasing; } elseif($health['usagetrend'] < 0) { print $text_usage_decreasing; } else { print $text_usage_neutral; } ?> (<?php print $text_usage_trend; ?>)<br/>
             </div>
          </div>
-		 
+
 </div></div>
 
 </body>