diff --git a/modoboa/admin/models/alias.py b/modoboa/admin/models/alias.py
index c8626267c..cc5e8f4f3 100644
--- a/modoboa/admin/models/alias.py
+++ b/modoboa/admin/models/alias.py
@@ -4,7 +4,7 @@ from django.db import models
 from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.translation import ugettext as _, ugettext_lazy
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.core import signals as core_signals
 from modoboa.lib.email_utils import split_mailbox
diff --git a/modoboa/admin/models/domain.py b/modoboa/admin/models/domain.py
index bf5197adf..8134fe401 100644
--- a/modoboa/admin/models/domain.py
+++ b/modoboa/admin/models/domain.py
@@ -1,12 +1,13 @@
 """Models related to domains management."""
 
-from django.contrib.contenttypes import generic
 from django.db import models
 from django.db.models.manager import Manager
 from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.translation import ugettext as _, ugettext_lazy
 
-import reversion
+from django.contrib.contenttypes.fields import GenericRelation
+
+from reversion import revisions as reversion
 
 from modoboa.core.models import User, ObjectAccess
 from modoboa.core import signals as core_signals
@@ -41,7 +42,7 @@ class Domain(AdminObject):
         help_text=ugettext_lazy("Check to activate this domain"),
         default=True
     )
-    owners = generic.GenericRelation(ObjectAccess)
+    owners = GenericRelation(ObjectAccess)
     type = models.CharField(default="domain", max_length=20)
 
     objects = DomainManager()
diff --git a/modoboa/admin/models/domain_alias.py b/modoboa/admin/models/domain_alias.py
index 1acf2ff92..92dbba536 100644
--- a/modoboa/admin/models/domain_alias.py
+++ b/modoboa/admin/models/domain_alias.py
@@ -4,9 +4,9 @@ from django.db import models
 from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.translation import ugettext as _, ugettext_lazy
 
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericRelation
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.core import models as core_models
 from modoboa.core import signals as core_signals
@@ -46,7 +46,7 @@ class DomainAlias(AdminObject):
         default=True
     )
 
-    owners = generic.GenericRelation(core_models.ObjectAccess)
+    owners = GenericRelation(core_models.ObjectAccess)
 
     objects = DomainAliasManager()
 
diff --git a/modoboa/admin/models/mailbox.py b/modoboa/admin/models/mailbox.py
index c201bc7b9..4239642cb 100644
--- a/modoboa/admin/models/mailbox.py
+++ b/modoboa/admin/models/mailbox.py
@@ -10,7 +10,7 @@ from django.db.models.manager import Manager
 from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.translation import ugettext as _, ugettext_lazy
 
-import reversion
+from reversion import revisions as reversion
 
 from .base import AdminObject
 from .domain import Domain
diff --git a/modoboa/admin/templates/admin/forward.html b/modoboa/admin/templates/admin/forward.html
index 3146beea6..49cc8815e 100644
--- a/modoboa/admin/templates/admin/forward.html
+++ b/modoboa/admin/templates/admin/forward.html
@@ -1,4 +1,4 @@
-{% load i18n form_tags %}{% load url from future %}
+{% load i18n form_tags %}
 <h2>{% trans "Forward" %} <small>{% trans "Automatically forward emails to another address" %}</small></h2>
 <hr>
 <form class="form-horizontal" method="POST" action="{% url 'user_forward' %}" 
diff --git a/modoboa/admin/templates/admin/identities.html b/modoboa/admin/templates/admin/identities.html
index dde5b0e5f..a8bfa985b 100644
--- a/modoboa/admin/templates/admin/identities.html
+++ b/modoboa/admin/templates/admin/identities.html
@@ -1,5 +1,5 @@
 {% extends "admin/listing.html" %}
-{% load admin_tags lib_tags i18n %}{% load url from future %}
+{% load admin_tags lib_tags i18n %}
 {% load static %}
 
 {% block pagetitle %}{% trans "Identities" %}{% endblock %}
diff --git a/modoboa/admin/views/alias.py b/modoboa/admin/views/alias.py
index ef771b8f1..571eada92 100644
--- a/modoboa/admin/views/alias.py
+++ b/modoboa/admin/views/alias.py
@@ -1,3 +1,4 @@
+"""Alias related views."""
 
 from django.contrib.auth.decorators import (
     login_required, permission_required
@@ -7,7 +8,7 @@ from django.db import IntegrityError
 from django.shortcuts import render
 from django.utils.translation import ugettext as _, ungettext
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.core import signals as core_signals
 from modoboa.lib.exceptions import PermDeniedException, Conflict
diff --git a/modoboa/admin/views/domain.py b/modoboa/admin/views/domain.py
index 2e3f57289..569599118 100644
--- a/modoboa/admin/views/domain.py
+++ b/modoboa/admin/views/domain.py
@@ -1,6 +1,4 @@
-"""
-Domain related views.
-"""
+"""Domain related views."""
 
 from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext as _, ungettext
@@ -11,7 +9,7 @@ from django.contrib.auth.decorators import (
     login_required, permission_required, user_passes_test
 )
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.core.models import User
 from modoboa.core import signals as core_signals
@@ -38,8 +36,8 @@ def index(request):
 
 @login_required
 @user_passes_test(
-    lambda u: u.has_perm("admin.view_domains")
-    or u.has_perm("admin.view_mailboxes")
+    lambda u: u.has_perm("admin.view_domains") or
+    u.has_perm("admin.view_mailboxes")
 )
 def _domains(request):
     sort_order, sort_dir = get_sort_order(request.GET, "name")
diff --git a/modoboa/admin/views/identity.py b/modoboa/admin/views/identity.py
index 7e58118c1..093a25dce 100644
--- a/modoboa/admin/views/identity.py
+++ b/modoboa/admin/views/identity.py
@@ -7,7 +7,7 @@ from django.shortcuts import render
 from django.utils.translation import ugettext as _, ungettext
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.core.models import User
 from modoboa.lib import parameters, events
diff --git a/modoboa/admin/views/import_.py b/modoboa/admin/views/import_.py
index 6c73109cd..c66627a6f 100644
--- a/modoboa/admin/views/import_.py
+++ b/modoboa/admin/views/import_.py
@@ -10,7 +10,7 @@ from django.db import transaction
 from django.shortcuts import render
 from django.utils.translation import ugettext as _
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.lib import events
 from modoboa.lib.exceptions import ModoboaException, Conflict
diff --git a/modoboa/admin/views/user.py b/modoboa/admin/views/user.py
index 5b8d51f70..c39859725 100644
--- a/modoboa/admin/views/user.py
+++ b/modoboa/admin/views/user.py
@@ -3,7 +3,7 @@
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.lib.web_utils import (
     render_to_json_response, _render_to_string
diff --git a/modoboa/core/handlers.py b/modoboa/core/handlers.py
index e5d6fb6ce..2f77e81bd 100644
--- a/modoboa/core/handlers.py
+++ b/modoboa/core/handlers.py
@@ -6,7 +6,7 @@ from django.db.models.signals import post_delete
 from django.dispatch import receiver
 from django.utils.translation import ugettext as _
 
-import reversion
+from reversion import revisions as reversion
 
 
 @receiver(reversion.post_revision_commit)
diff --git a/modoboa/core/models.py b/modoboa/core/models.py
index 1ce6c3da9..87f6cb6d7 100644
--- a/modoboa/core/models.py
+++ b/modoboa/core/models.py
@@ -6,14 +6,14 @@ from django.contrib.auth.hashers import make_password, is_password_usable
 from django.contrib.auth.models import (
     UserManager, Group, PermissionsMixin
 )
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.translation import ugettext as _, ugettext_lazy
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.core.password_hashers import get_password_hasher
 from modoboa.lib import events, parameters
@@ -470,7 +470,7 @@ class ObjectAccess(models.Model):
     user = models.ForeignKey(User)
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')
     is_owner = models.BooleanField(default=False)
 
     class Meta:
diff --git a/modoboa/core/templates/core/parameters.html b/modoboa/core/templates/core/parameters.html
index 7c8272790..a4b8538e4 100644
--- a/modoboa/core/templates/core/parameters.html
+++ b/modoboa/core/templates/core/parameters.html
@@ -1,4 +1,4 @@
-{% load i18n lib_tags %}{% load url from future %}
+{% load i18n lib_tags %}
 <h2>{% trans "Parameters" %} <small>{% trans "Configure Modoboa" %}</small></h2><hr />
 <form id="settings_form" method="POST" action="{% url 'core:parameter_save' %}" class="form-horizontal">{% csrf_token %}
   {% include "common/parameters.html" %}
diff --git a/modoboa/core/templates/core/user_preferences.html b/modoboa/core/templates/core/user_preferences.html
index 8bd449e74..a13dcf1ed 100644
--- a/modoboa/core/templates/core/user_preferences.html
+++ b/modoboa/core/templates/core/user_preferences.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load url from future %}
+{% load i18n %}
 <h2>{% trans "Preferences" %} <small>{% trans "Customize Modoboa" %}</small></h2>
 <hr>
 {% if forms %}
diff --git a/modoboa/core/templates/core/user_profile.html b/modoboa/core/templates/core/user_profile.html
index 62617fba7..c2425f31e 100644
--- a/modoboa/core/templates/core/user_profile.html
+++ b/modoboa/core/templates/core/user_profile.html
@@ -1,5 +1,4 @@
 {% load i18n form_tags %}
-{% load url from future %}
 
 <h2>{% trans "Profile" %} <small>{% trans "Update your personal information" %}</small></h2>
 <hr>
diff --git a/modoboa/core/utils.py b/modoboa/core/utils.py
index 7b6549936..683cb0c9d 100644
--- a/modoboa/core/utils.py
+++ b/modoboa/core/utils.py
@@ -2,7 +2,7 @@
 
 from django.utils.translation import ugettext as _
 
-from django.contrib.sites.models import get_current_site
+from django.contrib.sites.shortcuts import get_current_site
 
 from modoboa.core.extensions import exts_pool
 from modoboa.lib import parameters
diff --git a/modoboa/lib/models.py b/modoboa/lib/models.py
index f98bfdc34..8f87b50d7 100644
--- a/modoboa/lib/models.py
+++ b/modoboa/lib/models.py
@@ -1,7 +1,10 @@
-import reversion
+"""Modoboa Lib models."""
+
 from django.db import models
 from django.conf import settings
 
+from reversion import revisions as reversion
+
 
 class Parameter(models.Model):
     name = models.CharField(max_length=255)
diff --git a/modoboa/lib/templatetags/form_tags.py b/modoboa/lib/templatetags/form_tags.py
index 4a2ae2034..5d6d542c9 100644
--- a/modoboa/lib/templatetags/form_tags.py
+++ b/modoboa/lib/templatetags/form_tags.py
@@ -4,6 +4,7 @@ Form rendering tags.
 
 from django import forms
 from django import template
+from django.utils.safestring import mark_safe
 from django.template.loader import render_to_string
 
 from modoboa.lib.form_utils import SeparatorField
@@ -20,7 +21,7 @@ def render_form(form, tpl=None):
     ret = ""
     for field in form:
         ret += "%s\n" % render_field(field)
-    return ret
+    return mark_safe(ret)
 
 
 def configure_field_classes(field):
diff --git a/modoboa/relaydomains/models.py b/modoboa/relaydomains/models.py
index b0a33c908..8beb5e1fa 100644
--- a/modoboa/relaydomains/models.py
+++ b/modoboa/relaydomains/models.py
@@ -4,7 +4,7 @@ from django.db import models
 from django.db.models.manager import Manager
 from django.utils.translation import ugettext as _, ugettext_lazy
 
-import reversion
+from reversion import revisions as reversion
 
 from modoboa.admin import models as admin_models
 from modoboa.lib import parameters
diff --git a/modoboa/static/js/twocols_nav.js b/modoboa/static/js/twocols_nav.js
index 404cf6f5c..c7dda2be5 100644
--- a/modoboa/static/js/twocols_nav.js
+++ b/modoboa/static/js/twocols_nav.js
@@ -69,7 +69,7 @@ TwocolsNav.prototype = {
 
     toggle_field_visibility: function($field, $parent, value) {
         if ($parent.attr("disabled") === undefined &&
-            $field.attr("data-visibility-value") == value) {
+            $field.attr("data-visibility-value") === value) {
             $field.attr("disabled", null);
             $field.show();
             this.propagate_change($field);
diff --git a/modoboa/templates/layout_simple.html b/modoboa/templates/layout_simple.html
index 9a5bdcf2d..5848b087c 100644
--- a/modoboa/templates/layout_simple.html
+++ b/modoboa/templates/layout_simple.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-{% load url from future %}
 {% load static %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 1cf9778c8..2ca442bea 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 {% load static %}
-{% load i18n core_tags lib_tags %}{% load url from future %}
+{% load i18n core_tags lib_tags %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
     <meta charset="utf-8" />
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index 838588b14..92b4cf664 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 {% load i18n core_tags lib_tags form_tags %}
 {% load static %}
-{% load url from future %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
     <meta charset="utf-8" />