diff --git a/modoboa/admin/templates/admin/extensions.html b/modoboa/admin/templates/admin/extensions.html
index aabf44f81..2eb7f6fad 100644
--- a/modoboa/admin/templates/admin/extensions.html
+++ b/modoboa/admin/templates/admin/extensions.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <h2>{% trans "Extensions" %} <small>{% trans "Choose the extension(s) to use" %}</small></h2><hr />
-<form id="settings_form" method="POST" action="{% url modoboa.admin.views.saveextensions %}">
+<form id="settings_form" method="POST" action="{% url 'modoboa.admin.views.saveextensions' %}">
   {{ extensions|safe }}
 </form>
 <a href="#" class="btn btn-primary" id="update" name="update">{% trans 'Save' %}</a>
diff --git a/modoboa/admin/templates/admin/identities.html b/modoboa/admin/templates/admin/identities.html
index 183261cf0..be0da8c6b 100644
--- a/modoboa/admin/templates/admin/identities.html
+++ b/modoboa/admin/templates/admin/identities.html
@@ -6,19 +6,19 @@
 <script type="text/javascript" src="{{ STATIC_URL }}js/autocompleter.js"></script>
 <script type="text/javascript">
 function get_domains_list(container) {
-    $.getJSON("{% url modoboa.admin.views.domains_list %}", function(data) {
+    $.getJSON("{% url 'modoboa.admin.views.domains_list' %}", function(data) {
         container.value = data;
     });
 }
 
 function get_account_list(container) {
-    $.getJSON("{% url modoboa.admin.views.accounts_list %}", function(data) {
+    $.getJSON("{% url 'modoboa.admin.views.accounts_list' %}", function(data) {
         container.value = data;
     });
 }
 
 function get_mboxes_list(container) {
-    $.getJSON("{% url modoboa.admin.views.mboxes_list %}", function(data) {
+    $.getJSON("{% url 'modoboa.admin.views.mboxes_list' %}", function(data) {
         container.value = data;
     });
 }
diff --git a/modoboa/admin/templates/admin/parameters.html b/modoboa/admin/templates/admin/parameters.html
index 02d48423f..3cbf6ac3e 100644
--- a/modoboa/admin/templates/admin/parameters.html
+++ b/modoboa/admin/templates/admin/parameters.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% url modoboa.admin.views.saveparameters as action %}
+{% url "modoboa.admin.views.saveparameters" as action %}
 <h2>{% trans "Parameters" %} <small>{% trans "Configure Modoboa" %}</small></h2><hr />
 <form id="settings_form" method="POST" action="{{ action }}" class="form-horizontal">
   {% include "common/parameters.html" %}
diff --git a/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html b/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html
index 6628d7a04..91f0fed20 100644
--- a/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html
+++ b/modoboa/extensions/amavis/templates/amavis/notifications/pending_requests.html
@@ -9,6 +9,6 @@
 {% trans "To:" %} {{ msg.rid.email }}
 {% trans "Date:" %} {{ msg.mail.time_num|fromunix|date:"DATETIME_FORMAT" }}
 {% trans "Subject:" %} {{ msg.mail.subject }}
-{% trans "Act on this message:" %} {{ baseurl }}{% url modoboa.extensions.amavis.views.index %}#{{ msg.mail.mail_id }}/?rcpt={{ msg.rid.email }}
+{% trans "Act on this message:" %} {{ baseurl }}{% url "modoboa.extensions.amavis.views.index" %}#{{ msg.mail.mail_id }}/?rcpt={{ msg.rid.email }}
 {% endfor %}
 {% blocktrans %}Please visit {{ listingurl }} for a full listing.{% endblocktrans %}
diff --git a/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html b/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
index 8c852ac16..3216566a9 100644
--- a/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
+++ b/modoboa/extensions/amavis/templates/amavis/viewmail_selfservice.html
@@ -12,7 +12,7 @@
     <script src="{{ STATIC_URL }}js/global.js" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}js/notify.js" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}amavis/js/selfservice.js" type="text/javascript"></script>
-    {% url django.views.i18n.javascript_catalog as catalog_url %}
+    {% url "django.views.i18n.javascript_catalog" as catalog_url %}
     <script type="text/javascript" src="{{ catalog_url }}"></script>
     <script type="text/javascript">
         set_media_url("{{ STATIC_URL }}");
diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index 5622c98e6..f740d18c3 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -139,7 +139,7 @@ def viewmail_selfservice(request, mail_id,
     if rcpt is None:
         raise Http404
     content = Template("""
-<iframe src="{% url modoboa.extensions.amavis.views.getmailcontent mail_id %}" id="mailcontent"></iframe>
+<iframe src="{% url 'modoboa.extensions.amavis.views.getmailcontent' mail_id %}" id="mailcontent"></iframe>
 """).render(Context(dict(mail_id=mail_id)))
 
     return _render(request, tplname, dict(
diff --git a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
index c5f30c794..a67977c43 100644
--- a/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
+++ b/modoboa/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html
@@ -2,7 +2,7 @@
 <h2>{% trans "Auto-reply message" %} <small>{% trans "Define a message to automatically send when you are off" %}</small></h2>
 <hr>
 <form class="form-horizontal" method="POST" 
-      action="{% url modoboa.extensions.postfix_autoreply.views.autoreply %}" 
+      action="{% url 'modoboa.extensions.postfix_autoreply.views.autoreply' %}" 
       id="uprefs_form">
   {% render_form form %}
   <div class="form-actions">
diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html b/modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html
index 8e3150185..2fa771b09 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/guieditor.html
@@ -13,7 +13,7 @@
     <td>
       <a name="togglestate" 
          class={% if filter.enabled %}"green"{% else %}"red"{% endif %}
-         href="{% url modoboa.extensions.sievefilters.views.toggle_filter_state fs.name filter.name %}">
+         href="{% url 'modoboa.extensions.sievefilters.views.toggle_filter_state' fs.name filter.name %}">
         {{ filter.enabled|yesno }}
       </a>
     </td>
diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/index.html b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
index 2ed152bbf..b234f3001 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/index.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
@@ -15,8 +15,8 @@ var cond_templates = null;
 var action_templates = null;
 
 function filterform_cb() {
-    cond_templates = fetch_templates("{% url modoboa.extensions.sievefilters.views.get_templates 'condition' %}", cond_templates);
-    action_templates = fetch_templates("{% url modoboa.extensions.sievefilters.views.get_templates 'action' %}", action_templates);
+    cond_templates = fetch_templates("{% url 'modoboa.extensions.sievefilters.views.get_templates' 'condition' %}", cond_templates);
+    action_templates = fetch_templates("{% url 'modoboa.extensions.sievefilters.views.get_templates' 'action' %}", action_templates);
 
     var $dc = $("#condition_0").dyncondition({
         templates: cond_templates
diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html b/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html
index 20fbf55d3..cf0e28508 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/rawfilter.html
@@ -1,4 +1,4 @@
-<form action="{% url modoboa.extensions.sievefilters.views.savefs name %}" 
+<form action="{% url 'modoboa.extensions.sievefilters.views.savefs' name %}" 
       method="POST" id="feditor" name="feditor">
   <textarea id="scriptcontent" name="scriptcontent">{{ scriptcontent }}</textarea>
 </form>
diff --git a/modoboa/extensions/stats/templates/stats/index.html b/modoboa/extensions/stats/templates/stats/index.html
index b99f30101..c95691a42 100644
--- a/modoboa/extensions/stats/templates/stats/index.html
+++ b/modoboa/extensions/stats/templates/stats/index.html
@@ -7,14 +7,14 @@
 <script type="text/javascript" src="{{ STATIC_URL }}stats/js/stats.js"></script>
 <script type="text/javascript">
 function get_domains_list(container) {
-    $.getJSON("{% url modoboa.admin.views.domains_list %}", function(data) {
+    $.getJSON("{% url 'modoboa.admin.views.domains_list' %}", function(data) {
         container.value = data;
     });
 }
 
 $(document).ready(function() {
     var stats = new Stats({
-        graphurl: "{% url modoboa.extensions.stats.views.graphs %}",
+        graphurl: "{% url 'modoboa.extensions.stats.views.graphs' %}",
         deflocation: "{{ deflocation|safe }}",
         language: "{{ LANGUAGE_CODE }}"
     });
diff --git a/modoboa/extensions/webmail/templates/webmail/attachments.html b/modoboa/extensions/webmail/templates/webmail/attachments.html
index 50f339ee0..86c78e795 100644
--- a/modoboa/extensions/webmail/templates/webmail/attachments.html
+++ b/modoboa/extensions/webmail/templates/webmail/attachments.html
@@ -13,7 +13,7 @@
 <div class="well" id="attachment_list">
 {% for att in attachments %}
 <div class="row-fluid">
-  <a href="{% url modoboa.extensions.webmail.views.delattachment %}?name={{ att.tmpname }}"
+  <a href="{% url 'modoboa.extensions.webmail.views.delattachment' %}?name={{ att.tmpname }}"
      name="delattachment">
     <i class="icon-remove"></i>
   </a>
diff --git a/modoboa/extensions/webmail/templates/webmail/compose.html b/modoboa/extensions/webmail/templates/webmail/compose.html
index 88c23d0c5..0fa2a0e37 100644
--- a/modoboa/extensions/webmail/templates/webmail/compose.html
+++ b/modoboa/extensions/webmail/templates/webmail/compose.html
@@ -10,7 +10,7 @@
       {% if form.cc.value %}{% render_field form.cc %}{% else %}{% render_and_hide_field form.cc %}{% endif %}
       {% render_and_hide_field form.cci %}
       {% render_field form.subject %}
-      <div id="attachments" name="{% url modoboa.extensions.webmail.views.attachments %}">
+      <div id="attachments" name="{% url 'modoboa.extensions.webmail.views.attachments' %}">
         <div>
           <img src="{{ STATIC_URL }}pics/attachment.png" />
           {% trans "Attachments" %}
diff --git a/modoboa/extensions/webmail/templates/webmail/headers.html b/modoboa/extensions/webmail/templates/webmail/headers.html
index b6665c98b..ec5e4f213 100644
--- a/modoboa/extensions/webmail/templates/webmail/headers.html
+++ b/modoboa/extensions/webmail/templates/webmail/headers.html
@@ -2,7 +2,7 @@
 {% block extraheaders %}{% if attachments %}
   <div class="row">
     <div class="header">{% trans "Attachments" %}</div>
-    <div class="value">{% url modoboa.extensions.webmail.views.getattachment as url %}
+    <div class="value">{% url "modoboa.extensions.webmail.views.getattachment" as url %}
       {% for key, fname in attachments.items %}
       <a href="{{ url }}?mbox={{ folder }}&mailid={{ mail_id }}&fname={{ fname }}&partnumber={{ key }}">{{ fname }}</a>
       {% endfor %}
diff --git a/modoboa/extensions/webmail/templates/webmail/index.html b/modoboa/extensions/webmail/templates/webmail/index.html
index 3707560fc..ed4ebdfe3 100644
--- a/modoboa/extensions/webmail/templates/webmail/index.html
+++ b/modoboa/extensions/webmail/templates/webmail/index.html
@@ -14,9 +14,9 @@ var webmail = undefined;
 $(document).ready(function() {
     webmail = new Webmail({
         poller_interval: {{ refreshrate }},
-        poller_url: "{% url modoboa.extensions.webmail.views.check_unseen_messages %}",
-        move_url: "{% url modoboa.extensions.webmail.views.move %}",
-        submboxes_url: "{% url modoboa.extensions.webmail.views.submailboxes %}",
+        poller_url: "{% url 'modoboa.extensions.webmail.views.check_unseen_messages' %}",
+        move_url: "{% url 'modoboa.extensions.webmail.views.move' %}",
+        submboxes_url: "{% url 'modoboa.extensions.webmail.views.submailboxes' %}",
         deflocation: "{{ deflocation }}",
         defcallback: "{{ defcallback }}",
         ro_mboxes: {% tolist ro_mboxes %}
diff --git a/modoboa/templates/layout_simple.html b/modoboa/templates/layout_simple.html
index 02fb8a925..6369c68e3 100644
--- a/modoboa/templates/layout_simple.html
+++ b/modoboa/templates/layout_simple.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap-responsive.css" />
     <script src="{{ STATIC_URL }}js/bootstrap.js" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}js/bootstrap-datepicker.js" type="text/javascript"></script>
-    {% url django.views.i18n.javascript_catalog as catalog_url %}
+    {% url "django.views.i18n.javascript_catalog" as catalog_url %}
     <script type="text/javascript" src="{{ catalog_url }}"></script>
     <style>
       body {
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 147205d6c..7eabcb6e4 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -16,7 +16,7 @@
     <script src="{{ STATIC_URL }}js/confirmation.js" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}js/notify.js" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}js/poller.js" type="text/javascript"></script>
-    {% url django.views.i18n.javascript_catalog as catalog_url %}
+    {% url "django.views.i18n.javascript_catalog" as catalog_url %}
     <script type="text/javascript" src="{{ catalog_url }}"></script>
     <script type="text/javascript">
       set_static_url("{{ STATIC_URL }}");
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index 85d16aa6a..63e649405 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/login.css" />
     <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap.js"></script>
-    {% url django.views.i18n.javascript_catalog as catalog_url %}
+    {% url "django.views.i18n.javascript_catalog" as catalog_url %}
     <script type="text/javascript" src="{{ catalog_url }}"></script>
     <script type="text/javascript">
     $(document).ready(function() {
@@ -26,7 +26,7 @@
           </div>
         </div>
         <div class="row">
-          <form method="post" action="{% url modoboa.auth.views.dologin %}" 
+          <form method="post" action="{% url 'modoboa.auth.views.dologin' %}" 
                 class="well span3">
             {% render_field form.username %}
             {% render_field form.password %}
diff --git a/modoboa/userprefs/templates/userprefs/forward.html b/modoboa/userprefs/templates/userprefs/forward.html
index 5aaf2b009..1aecb3f1e 100644
--- a/modoboa/userprefs/templates/userprefs/forward.html
+++ b/modoboa/userprefs/templates/userprefs/forward.html
@@ -1,7 +1,7 @@
 {% load i18n libextras %}
 <h2>{% trans "Forward" %} <small>{% trans "Automatically forward emails to another address" %}</small></h2>
 <hr>
-<form class="form-horizontal" method="POST" action="{% url modoboa.userprefs.views.forward %}" 
+<form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.forward' %}" 
       id="uprefs_form">
   {% render_form form %}
   <div class="form-actions">
diff --git a/modoboa/userprefs/templates/userprefs/preferences.html b/modoboa/userprefs/templates/userprefs/preferences.html
index f20af214c..1a67a22c5 100644
--- a/modoboa/userprefs/templates/userprefs/preferences.html
+++ b/modoboa/userprefs/templates/userprefs/preferences.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <h2>{% trans "Preferences" %} <small>{% trans "Customize Modoboa" %}</small></h2>
 <hr>
-<form class="form-horizontal" method="POST" action="{% url modoboa.userprefs.views.preferences %}" 
+<form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.preferences' %}" 
       id="uprefs_form">
   {% include "common/parameters.html" %}
   <hr>
diff --git a/modoboa/userprefs/templates/userprefs/profile.html b/modoboa/userprefs/templates/userprefs/profile.html
index 709f93f37..b553b06f8 100644
--- a/modoboa/userprefs/templates/userprefs/profile.html
+++ b/modoboa/userprefs/templates/userprefs/profile.html
@@ -1,7 +1,7 @@
 {% load i18n libextras %}
 <h2>{% trans "Profile" %} <small>{% trans "Update your personal information" %}</small></h2>
 <hr>
-<form class="form-horizontal" method="POST" action="{% url modoboa.userprefs.views.profile %}" 
+<form class="form-horizontal" method="POST" action="{% url 'modoboa.userprefs.views.profile' %}" 
       id="uprefs_form">
   {% render_form form %}
   <div class="form-actions">