diff --git a/src/locales/en.json b/src/locales/en.json
index e4e5dbd9..2e507bcc 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -237,5 +237,7 @@
     "user_emailaliases" : "Mail aliases",
     "user_emailforward" : "Mail forward",
     "user_new_mail": "newmail@mydomain.org",
-    "user_new_forward": "newforward@myforeigndomain.org"
+    "user_new_forward": "newforward@myforeigndomain.org",
+    "user_quota": "Quota",
+    "quota_description": "Mailbox size quota must be a size with b/k/M/G/T suffix or 0 to disable the quota"
 }
diff --git a/src/views/user/user_create.ms b/src/views/user/user_create.ms
index 9014d6aa..04f15424 100644
--- a/src/views/user/user_create.ms
+++ b/src/views/user/user_create.ms
@@ -43,6 +43,13 @@
             </div>
         </div>
         <hr>
+        <div class="form-group">
+            <label for="quota" class="col-sm-3 control-label">{{t 'user_quota'}}</label>
+            <div class="col-sm-9">
+                <input type="ext" id="quota" name="quota" class="form-control" placeholder="10G" required>
+                <div class="help-block">{{t 'quota_description'}}</div>
+            </div>
+        </div>
         <div class="form-group">
             <label for="password" class="col-sm-3 control-label">{{t 'password'}}</label>
             <div class="col-sm-9">
diff --git a/src/views/user/user_edit.ms b/src/views/user/user_edit.ms
index 347cac42..64425e20 100644
--- a/src/views/user/user_edit.ms
+++ b/src/views/user/user_edit.ms
@@ -42,7 +42,12 @@
                    {{/domains}}
                </select>
             </div>
-
+        </div>
+        <div class="form-group">
+            <label for="username" class="col-sm-3 control-label">{{t 'user_quota'}}</label>
+            <div class="col-sm-9">
+                <input type="text" id="mailbox-quota" name="mailbox-quota" class="form-control" placeholder="{{mailbox-quota}}" value="{{mailbox-quota}}">
+            </div>
         </div>
 
         <hr>
diff --git a/src/views/user/user_info.ms b/src/views/user/user_info.ms
index 2dce67dc..34dfba67 100644
--- a/src/views/user/user_info.ms
+++ b/src/views/user/user_info.ms
@@ -33,6 +33,12 @@
             <td>{{mail}}</td>
           </tr>
 
+          <tr>
+            <td><strong>{{t 'user_quota'}}</strong></td>
+
+            <td>{{mailbox-quota}}</td>
+          </tr
+
           <tr>
             <td><strong>{{t 'user_emailaliases'}}</strong></td>
 
diff --git a/src/views/user/user_list.ms b/src/views/user/user_list.ms
index c00fa3bc..8454c0c0 100644
--- a/src/views/user/user_list.ms
+++ b/src/views/user/user_list.ms
@@ -17,6 +17,7 @@
         <span class="pull-right fa-chevron-right"></span>
         <h2 class="list-group-item-heading">{{username}} <small>{{fullname}}</small></h2>
         <p class="list-group-item-text">{{mail}}</p>
+        <p class="list-group-item-text">{{mailbox-quota}}</p>
     </a>
 {{/users}}