diff --git a/interface/web/mail/list/mail_user_stats.list.php b/interface/web/mail/list/mail_user_stats.list.php
index cfbafe11b63b7a64f938e9919100fe9034ddc225..783d2e78072f19ce7cd462cba3deb90c090be5e4 100644
--- a/interface/web/mail/list/mail_user_stats.list.php
+++ b/interface/web/mail/list/mail_user_stats.list.php
@@ -43,7 +43,7 @@ $liste["paging_tpl"]  = "templates/paging.tpl.htm";
 $liste["auth"]    = "yes";
 
 // mark columns for php sorting (no real mySQL columns)
-$liste["phpsort"] = array('this_month', 'last_month', 'this_year', 'last_year');
+$liste["phpsort"] = array('this_month_sort', 'last_month_sort', 'this_year_sort', 'last_year_sort');
 
 /*****************************************************
 * Suchfelder
diff --git a/interface/web/mail/list/user_quota_stats.list.php b/interface/web/mail/list/user_quota_stats.list.php
index e8faae36340d654ab2545669c21c378858920f4c..79111c154dfe44efde488a622169dc8cd2da0074 100644
--- a/interface/web/mail/list/user_quota_stats.list.php
+++ b/interface/web/mail/list/user_quota_stats.list.php
@@ -42,7 +42,6 @@ $liste["auth"]    = "yes";
 
 // mark columns for php sorting (no real mySQL columns)
 $liste["phpsort"] = array('used_sort', 'percentage_sort');
-
 /*****************************************************
 * Suchfelder
 *****************************************************/
diff --git a/interface/web/mail/mail_user_stats.php b/interface/web/mail/mail_user_stats.php
index abb5461e541ca7c02866d21c290d303778cfa5d0..6b91f3bec8c4cea467bcba790d680ba9754d39b6 100644
--- a/interface/web/mail/mail_user_stats.php
+++ b/interface/web/mail/mail_user_stats.php
@@ -35,6 +35,7 @@ class list_action extends listform_actions {
 		//** Traffic of the current month
 		$tmp_date = date('Y-m');
 		$tmp_rec = $app->db->queryOneRecord("SELECT traffic as t FROM mail_traffic WHERE mailuser_id = ? AND month = ?", $rec['mailuser_id'], $tmp_date);
+		$rec['this_month_sort'] = $tmp_rec['t'];
 //		$rec['this_month'] = number_format($app->functions->intval($tmp_rec['t'])/1024/1024, 0, '.', ' ');
 		$rec['this_month'] = $app->functions->formatBytes($tmp_rec['t']);
 		if ($rec['this_month'] == 'NAN') $rec['this_month'] = '0 KB';
@@ -42,6 +43,7 @@ class list_action extends listform_actions {
 		//** Traffic of the current year
 		$tmp_date = date('Y');
 		$tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic) as t FROM mail_traffic WHERE mailuser_id = ? AND month like ?", $rec['mailuser_id'], $tmp_date . '%');
+		$rec['this_year_sort'] = $tmp_rec['t'];
 //		$rec['this_year'] = number_format($app->functions->intval($tmp_rec['t'])/1024/1024, 0, '.', ' ');
 		$rec['this_year'] = $app->functions->formatBytes($tmp_rec['t']);
 		if ($rec['this_year'] == 'NAN') $rec['this_year'] = '0 KB';
@@ -49,6 +51,7 @@ class list_action extends listform_actions {
 		//** Traffic of the last month
 		$tmp_date = date('Y-m', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
 		$tmp_rec = $app->db->queryOneRecord("SELECT traffic as t FROM mail_traffic WHERE mailuser_id = ? AND month = ?", $rec['mailuser_id'], $tmp_date);
+		$rec['last_month_sort'] = $tmp_rec['t'];
 //		$rec['last_month'] = number_format($app->functions->intval($tmp_rec['t'])/1024/1024, 0, '.', ' ');
 		$rec['last_month'] = $app->functions->formatBytes($tmp_rec['t']);
 		if ($rec['last_month'] == 'NAN') $rec['last_month'] = '0 KB';
@@ -56,6 +59,7 @@ class list_action extends listform_actions {
 		//** Traffic of the last year
 		$tmp_date = date('Y', mktime(0, 0, 0, date("m"), date("d"), date("Y")-1));
 		$tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic) as t FROM mail_traffic WHERE mailuser_id = ? AND month like ?", $rec['mailuser_id'], $tmp_date . '%');
+		$rec['last_year_sort'] = $tmp_rec['t'];
 //		$rec['last_year'] = number_format($app->functions->intval($tmp_rec['t'])/1024/1024, 0, '.', ' ');
 		$rec['last_year'] = $app->functions->formatBytes($tmp_rec['t']);
 		if ($rec['last_year'] == 'NAN') $rec['last_year'] = '0 KB';
diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm
index 0718cc8aed3444b41da4532da67488f9353e2b3f..f832633315ab76db499dd320b1870b664cded5b6 100644
--- a/interface/web/mail/templates/mail_user_stats_list.htm
+++ b/interface/web/mail/templates/mail_user_stats_list.htm
@@ -9,11 +9,11 @@
 <table class="table">
                 <thead class="dark form-group-sm">
                     <tr>
-                        <th data-column="email"><tmpl_var name="email_txt"></th>
-                        <th data-column="this_month"><tmpl_var name="this_month_txt"></th>
-                        <th data-column="last_month"><tmpl_var name="last_month_txt"></th>
-                        <th data-column="this_year"><tmpl_var name="this_year_txt"></th>
-                        <th data-column="last_year"><tmpl_var name="last_year_txt"></th>
+                        <th class="col-md-3" data-column="email"><tmpl_var name="email_txt"></th>
+                        <th class="col-md-1" data-column="this_month_sort"><tmpl_var name="this_month_txt"></th>
+                        <th class="col-md-1" data-column="last_month_sort"><tmpl_var name="last_month_txt"></th>
+                        <th class="col-md-1" data-column="this_year_sort"><tmpl_var name="this_year_txt"></th>
+                        <th class="col-md-1" data-column="last_year_sort"><tmpl_var name="last_year_txt"></th>
                         <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr>
diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm
index 4b4b831aab7cc4bbc066d85d4671e249cfbf3395..37ac43894ff97e4afec03c8442e1c33da06b32fb 100644
--- a/interface/web/mail/templates/user_quota_stats_list.htm
+++ b/interface/web/mail/templates/user_quota_stats_list.htm
@@ -8,18 +8,18 @@
 <table class="table">
                 <thead class="dark form-group-sm">
                     <tr>
-                        <th data-column="email"><tmpl_var name="email_txt"></th>
-                        <th data-column="name"><tmpl_var name="name_txt"></th>
-                        <th data-column="used"><tmpl_var name="used_txt"></th>
-                        <th data-column="quota"><tmpl_var name="quota_txt"></th>
-                        <th data-column="percentage"><tmpl_var name="percentage_txt"></th>
-                        <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
+                        <th class="col-md-3" data-column="email"><tmpl_var name="email_txt"></th>
+                        <th class="col-md-2" data-column="name"><tmpl_var name="name_txt"></th>
+                        <th class="col-md-1" data-column="used_sort"><tmpl_var name="used_txt"></th>
+                        <th class="col-md-1" data-column="quota"><tmpl_var name="quota_txt"></th>
+                        <th class="col-md-1" data-column="percentage_sort"><tmpl_var name="percentage_txt"></th>
+                        <th class="col-md-1 text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr>
                         <td><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
                         <td><input class="form-control" type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
                         <td>&nbsp;</td>
-                        <td>&nbsp;</td>
+			<td>&nbsp;</td>
                         <td>&nbsp;</td>
                         <td class="text-right">
                             <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="mail/user_quota_stats.php"><span class="icon icon-filter"></span></button>
diff --git a/interface/web/mail/user_quota_stats.php b/interface/web/mail/user_quota_stats.php
index 90a92558fa03871336c6396fe2dee241ab1e724b..39e7cf5156fb40c616e319f312f2f73964588f1b 100644
--- a/interface/web/mail/user_quota_stats.php
+++ b/interface/web/mail/user_quota_stats.php
@@ -53,7 +53,7 @@ class list_action extends listform_actions {
 
 		if($rec['quota'] == 0){
 			$rec['quota'] = $app->lng('unlimited');
-			$rec['percentage'] = '';
+			$rec['percentage'] = 'n/a';
 			$rec['percentage_sort'] = 0;
 		} else {
 			$rec['percentage'] = round(100 * $rec['used'] / $rec['quota']) . '%';
@@ -63,13 +63,6 @@ class list_action extends listform_actions {
 
 
 		$rec['used_sort'] = $rec['used'];
-/*
-		if($rec['used'] < 1544000) {
-			$rec['used'] = round($rec['used'] / 1024, 4).' KB';
-		} else {
-			$rec['used'] = round($rec['used'] / 1048576, 4).' MB';
-		}
-*/
 		$rec['used']=$app->functions->formatBytes($rec['used']);
 		if ($rec['used'] == 'NAN') $rec['used']='0 KB';