diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py
index 4499ef6f5..2f23c97f9 100644
--- a/modoboa/admin/forms.py
+++ b/modoboa/admin/forms.py
@@ -20,6 +20,9 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
     class Meta:
         model = Domain
         fields = ("name", "quota", "aliases", "enabled")
+        widgets = dict(
+            quota=forms.widgets.TextInput(attrs={"class" : "span1"})
+            )
 
     def __init__(self, *args, **kwargs):
         self.oldname = None
@@ -435,7 +438,8 @@ class AccountFormMail(forms.Form, DynamicForm):
     quota = forms.IntegerField(
         label=ugettext_lazy("Quota"),
         required=False,
-        help_text=_("Quota in MB for this mailbox. Leave empty to use the value defined at domain level.")
+        help_text=_("Quota in MB for this mailbox. Leave empty to use the value defined at domain level."),
+        widget=forms.widgets.TextInput(attrs={"class" : "span1"})
         )
     aliases = forms.EmailField(
         label=ugettext_lazy("Alias(es)"), 
diff --git a/modoboa/admin/templates/admin/domain_general_form.html b/modoboa/admin/templates/admin/domain_general_form.html
index 168ea9409..53f087703 100644
--- a/modoboa/admin/templates/admin/domain_general_form.html
+++ b/modoboa/admin/templates/admin/domain_general_form.html
@@ -1,5 +1,5 @@
-{% load libextras %}
+{% load i18n libextras %}
 {% render_field form.name %}
-{% render_field form.quota %}
+{% render_field_appended form.quota _("MB") %}
 {% render_fields_group form "aliases" %}
 {% render_field form.enabled %}
diff --git a/modoboa/admin/templates/admin/mailform.html b/modoboa/admin/templates/admin/mailform.html
index 7ab8f295b..01da1c26a 100644
--- a/modoboa/admin/templates/admin/mailform.html
+++ b/modoboa/admin/templates/admin/mailform.html
@@ -1,4 +1,4 @@
 {% load libextras %}
 {% render_field form.email %}
-{% render_field form.quota %}
+{% render_field_appended form.quota _("MB") %}
 {% render_fields_group form "aliases" %}
diff --git a/modoboa/lib/templatetags/libextras.py b/modoboa/lib/templatetags/libextras.py
index c45615269..bab30a277 100644
--- a/modoboa/lib/templatetags/libextras.py
+++ b/modoboa/lib/templatetags/libextras.py
@@ -99,6 +99,12 @@ def render_field(field, help_display_mode="tooltip"):
             field=field, help_display_mode=help_display_mode
             ))
 
+@register.simple_tag
+def render_field_appended(field, text):
+    return render_to_string("common/generic_field.html", dict(
+            field=field, help_display_mode="tooltip", appended_text=text
+            ))
+
 @register.simple_tag
 def render_and_hide_field(field):
     return render_to_string("common/generic_field.html", dict(
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index 108198a73..c1d927551 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -63,7 +63,8 @@ body {
 
 .spaced select,
 .spaced input[type="text"],
-.spaced input[type="password"] { 
+.spaced input[type="password"],
+.spaced span {
     margin-bottom: 8px;
 }
 
diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html
index b8e9caae3..207649813 100644
--- a/modoboa/templates/common/generic_field.html
+++ b/modoboa/templates/common/generic_field.html
@@ -2,7 +2,8 @@
 <div class="control-group {% if field.errors %}error{% endif %}"{% if hidden %}style="display: none"{% endif %}>
   {% if field.label %}<label class="control-label" for="id_{{ field.html_name }}">{{ field.label }}</label>{% endif %}{% if help_display_mode == "tooltip" and field.help_text %}<a href="#" class="help pull-left" data-original-title="{% trans 'Help:' %} {{ field.label }}" data-content="{{ field.help_text }}" rel="popover">?</a>{% endif %}
   <div class="controls spaced">
-    {{ field }}{% if help_display_mode == "inline" and field.help_text %}<span class="help-inline">{{ field.help_text }}</span>{% endif %}
+    {% if appended_text %}<div class="input-append">{% endif %}
+    {{ field }}{% if appended_text %}<span class="add-on">{{ appended_text }}</span></div>{% endif %}{% if help_display_mode == "inline" and field.help_text %}<span class="help-inline">{{ field.help_text }}</span>{% endif %}
     {% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
   </div>
 </div>