diff --git a/admin/forms.py b/admin/forms.py
index 34bfe06ea..f4000d841 100644
--- a/admin/forms.py
+++ b/admin/forms.py
@@ -290,9 +290,6 @@ class AccountFormGeneralPwd(AccountFormGeneral):
         return user
 
 class AccountFormMail(forms.Form, DynamicForm):
-    # FIXME
-    # * Renommage de boite ?
-
     email = forms.EmailField(label=ugettext_lazy("E-mail"), required=False)
     quota = forms.IntegerField(label=ugettext_lazy("Quota"), required=False)
     aliases = forms.EmailField(
@@ -309,11 +306,13 @@ class AccountFormMail(forms.Form, DynamicForm):
         if not hasattr(self, "mb") or self.mb is None:
             return
         self.fields["email"].required = True
-        for pos, alias in enumerate(self.mb.alias_set.all()):
+        cpt = 1
+        for alias in self.mb.alias_set.all():
             if len(alias.get_recipients()) >= 2:
                 continue
-            name = "aliases_%d" % (pos + 1)
+            name = "aliases_%d" % cpt
             self._create_field(forms.EmailField, name, alias.full_address)
+            cpt += 1
         self.fields["email"].initial = self.mb.full_address
         self.fields["quota"].initial = self.mb.quota
         if len(args) and isinstance(args[0], QueryDict):
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index b4edcddbb..627b58a62 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -1551,7 +1551,7 @@ msgstr "Répondre à tous"
 #: extensions/webmail/templatetags/webextras.py:29
 #: userprefs/templatetags/uprefs_extras.py:25
 msgid "Forward"
-msgstr "Transférer"
+msgstr "Transfert"
 
 #: extensions/webmail/templatetags/webextras.py:35
 msgid "Display options"
diff --git a/settings_sample.py b/settings_sample.py
index 25ded5f9a..4bbcc36c9 100644
--- a/settings_sample.py
+++ b/settings_sample.py
@@ -23,13 +23,13 @@ DATABASES = {
         "PORT" : ""
     },
     # "pfxadmin" : {
-    #     "ENGINE" : "",
+    #     "ENGINE" : "django.db.backends.",
     #     "NAME" : "",
     #     "USER" : "",
     #     "PASSWORD" : ""
     # },
     # "amavis": {
-    #	  "ENGINE" : "",
+    #	  "ENGINE" : "django.db.backends.",
     #	  "HOST" : "",
     #	  "NAME" : "",
     #	  "USER" : "",
@@ -116,6 +116,7 @@ INSTALLED_APPS = (
     'modoboa.userprefs',
 
     # Modoboa extensions here.
+    'modoboa.extensions.limits',
     'modoboa.extensions.postfix_autoreply',
     'modoboa.extensions.webmail',
     'modoboa.extensions.stats',
@@ -132,7 +133,6 @@ AUTHENTICATION_BACKENDS = (
 )
 
 #SESSION_COOKIE_AGE = 300
-#CACHE_BACKEND = 'file://'
 
 #
 # External LDAP authentication (optional)