diff --git a/modoboa/admin/templates/admin/mailform.html b/modoboa/admin/templates/admin/mailform.html
index 929d34674..c82ad0a6d 100644
--- a/modoboa/admin/templates/admin/mailform.html
+++ b/modoboa/admin/templates/admin/mailform.html
@@ -2,6 +2,5 @@
 
 {% render_field form.email %}
 {% include "common/generic_field.html" with field=form.quota help_display_mode="tooltip" label_width="col-sm-4" appended_text=_("MB") activator=True activator_value=form.quota_act.value deactivate_if_empty=False activator_label=_("Use domain default value") activator_size="col-sm-5" %}
-{% render_extra_fields form %}
 {% render_fields_group form "aliases" %}
 {% render_fields_group form "senderaddress" %}
diff --git a/modoboa/lib/templatetags/form_tags.py b/modoboa/lib/templatetags/form_tags.py
index 5d6d542c9..213dd17ad 100644
--- a/modoboa/lib/templatetags/form_tags.py
+++ b/modoboa/lib/templatetags/form_tags.py
@@ -79,17 +79,6 @@ def render_fields_group(form, pattern):
     ))
 
 
-@register.simple_tag
-def render_extra_fields(form):
-    result = ''
-    for fname in form.extra_fields:
-        result += render_to_string("common/generic_field.html", {
-            'field': form[fname], 'help_display_mode': 'tooltip',
-            'label_width': 'col-sm-4'
-        })
-    return result
-
-
 @register.simple_tag
 def render_field_width(field):
     """."""