Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

 interface/web/mail/user_quota_stats.php

@@ -27,7 +27,7 @@
      $tmp_array = unserialize($app->db->unquote($tmp_mon['data']));
      if(is_array($tmp_array)) {
         foreach($tmp_array as $username => $data) {
            $monitor_data[$username]['used'] += $data['used'];
            if(!$monitor_data[$username]['used']) $monitor_data[$username]['used'] = $data['used'];
         }
      }
   }