diff --git a/modoboa/extensions/webmail/templates/webmail/folder.html b/modoboa/extensions/webmail/templates/webmail/folder.html
index e0c03b57e..154008be6 100644
--- a/modoboa/extensions/webmail/templates/webmail/folder.html
+++ b/modoboa/extensions/webmail/templates/webmail/folder.html
@@ -1,5 +1,5 @@
 {% extends "common/generic_modal_form.html" %}
-{% load i18n webextras %}
+{% load i18n webmail_tags %}
 {% block extrafields %}
 <div id="folders2" class="well">
   <ul class="nav nav-list">
diff --git a/modoboa/extensions/webmail/templates/webmail/folders.html b/modoboa/extensions/webmail/templates/webmail/folders.html
index a25c3389f..37feb2064 100644
--- a/modoboa/extensions/webmail/templates/webmail/folders.html
+++ b/modoboa/extensions/webmail/templates/webmail/folders.html
@@ -1,4 +1,4 @@
-{% load i18n webextras %}
+{% load i18n webmail_tags %}
 <div id="mboxes_container">
   <ul class="nav nav-list">
     <li class="nav-header">{% trans "Mailboxes" %}</li>
diff --git a/modoboa/extensions/webmail/templatetags/webextras.py b/modoboa/extensions/webmail/templatetags/webmail_tags.py
similarity index 100%
rename from modoboa/extensions/webmail/templatetags/webextras.py
rename to modoboa/extensions/webmail/templatetags/webmail_tags.py
diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py
index 0d11fd3ba..488135646 100644
--- a/modoboa/extensions/webmail/views.py
+++ b/modoboa/extensions/webmail/views.py
@@ -24,7 +24,7 @@ from .lib import (
     clean_attachments, set_compose_session, send_mail,
     ImapEmail, ReplyModifier, ForwardModifier
 )
-from templatetags import webextras
+from templatetags import webmail_tags
 
 
 @login_required
@@ -559,7 +559,7 @@ def index(request):
             del response["menuargs"]
         try:
             response["menu"] = \
-                getattr(webextras, "%s_menu" % action)("", curmbox, request.user, **extra_args)
+                getattr(webmail_tags, "%s_menu" % action)("", curmbox, request.user, **extra_args)
         except KeyError:
             pass