diff --git a/management/mailconfig.py b/management/mailconfig.py
index 28e1c623..469a33a3 100755
--- a/management/mailconfig.py
+++ b/management/mailconfig.py
@@ -128,13 +128,14 @@ def get_mail_users_ex(env, with_archived=False):
 	users = []
 	active_accounts = set()
 	c = open_database(env)
-	c.execute('SELECT email, privileges FROM users')
+	c.execute('SELECT email, privileges, quota FROM users')
 	for email, privileges in c.fetchall():
 		active_accounts.add(email)
 
 		user = {
 			"email": email,
 			"privileges": parse_privs(privileges),
+			"user": quota,
 			"status": "active",
 		}
 		users.append(user)
diff --git a/management/templates/users.html b/management/templates/users.html
index dee79d42..09a66bc6 100644
--- a/management/templates/users.html
+++ b/management/templates/users.html
@@ -42,6 +42,7 @@
   <thead>
     <tr>
       <th width="50%">Email Address</th>
+      <th>Quota</th>
       <th>Actions</th>
     </tr>
   </thead>
@@ -54,6 +55,8 @@
   <tr id="user-template">
     <td class='address'>
     </td>
+	<td class="quota">
+	</td>
     <td class='actions'>
         <span class='privs'>
         </span>
@@ -152,7 +155,8 @@ function show_users() {
           n2.addClass("account_" + user.status);
 
           n.attr('data-email', user.email);
-          n.find('.address').text(user.email)
+          n.find('.address').text(user.email);
+          n.find('.quota').text(user.quota);
           n2.find('.restore_info tt').text(user.mailbox);
 
           if (user.status == 'inactive') continue;