diff --git a/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html b/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
index 184bb2039..f621117d9 100644
--- a/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
+++ b/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>{% load i18n lib_tags amextras %}{% load url from future %}
+<!DOCTYPE html>{% load i18n lib_tags amavis_tags %}{% load url from future %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
     <meta charset="utf-8" />
diff --git a/modoboa/extensions/amavis/templatetags/amextras.py b/modoboa/extensions/amavis/templatetags/amavis_tags.py
similarity index 100%
rename from modoboa/extensions/amavis/templatetags/amextras.py
rename to modoboa/extensions/amavis/templatetags/amavis_tags.py
diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index cca601a2f..b0e2ecf01 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -16,7 +16,7 @@ from modoboa.lib.webutils import (
 )
 from modoboa.lib.email_listing import parse_search_parameters
 from modoboa.extensions.admin.models import Mailbox, Domain
-from templatetags.amextras import quar_menu, viewm_menu
+from templatetags.amavis_tags import quar_menu, viewm_menu
 from .lib import selfservice, AMrelease
 from .sql_listing import SQLlisting, SQLemail, get_wrapper