diff --git a/gestion/mail/template/upload_stats/From/fr b/gestion/mail/template/upload_stats/From/fr
new file mode 100644
index 00000000..f75e6e37
--- /dev/null
+++ b/gestion/mail/template/upload_stats/From/fr
@@ -0,0 +1 @@
+{{from}}
diff --git a/gestion/mail/template/upload_stats/README b/gestion/mail/template/upload_stats/README
new file mode 100644
index 00000000..6513ea80
--- /dev/null
+++ b/gestion/mail/template/upload_stats/README
@@ -0,0 +1 @@
+Envoyé à disconnect chaque jour
diff --git a/gestion/mail/template/upload_stats/Subject/fr b/gestion/mail/template/upload_stats/Subject/fr
new file mode 100644
index 00000000..f23b52d2
--- /dev/null
+++ b/gestion/mail/template/upload_stats/Subject/fr
@@ -0,0 +1 @@
+Statistiques d'upload
diff --git a/gestion/mail/template/upload_stats/To/fr b/gestion/mail/template/upload_stats/To/fr
new file mode 100644
index 00000000..e6199f75
--- /dev/null
+++ b/gestion/mail/template/upload_stats/To/fr
@@ -0,0 +1 @@
+{{to}}
diff --git a/gestion/mail/template/upload_stats/X-Mailer/fr b/gestion/mail/template/upload_stats/X-Mailer/fr
new file mode 100644
index 00000000..f5d9c869
--- /dev/null
+++ b/gestion/mail/template/upload_stats/X-Mailer/fr
@@ -0,0 +1 @@
+{{ mailer }}
diff --git a/gestion/mail/template/upload_stats/body/fr b/gestion/mail/template/upload_stats/body/fr
new file mode 100644
index 00000000..69c013e4
--- /dev/null
+++ b/gestion/mail/template/upload_stats/body/fr
@@ -0,0 +1,6 @@
+Upload des serveurs (à partir de {{seuil_upload}})
+
+{{upload_srv}}
+
+-- 
+Disconnect team
diff --git a/surveillance/statistiques2.py b/surveillance/statistiques2.py
index ede19e82..9faf97d3 100755
--- a/surveillance/statistiques2.py
+++ b/surveillance/statistiques2.py
@@ -23,6 +23,7 @@ import psycopg2.extras
 import smtplib
 import gestion.config.upload as upload_config
 import gestion.config as config
+from gestion import mail as mail_module
 
 ldap = lc_ldap.shortcuts.lc_ldap_readonly()
 encoding = "UTF-8"
@@ -189,27 +190,17 @@ if __name__ == "__main__":
     if args.mail:
         expediteur = "disconnect@crans.org"
         destinataire = "disconnect@crans.org"
-        message = """From: %(From)s
-        To: %(To)s
-        Subject: Statistiques des =?utf-8?q?derni=C3=A8res?= 24h
-        X-Mailer: /usr/scripts/surveillance/statistiques.py
-        Content-Type: text/plain; charset="utf-8"
-
-        Upload des serveurs (à partir de %(seuil_upload)s)
-        %(upload_srv)s
-
-        --
-        statistiques.py
-        """
-
-        corps = message % {
-            'From': expediteur,
-            'To': destinataire,
-            'upload_srv': fetched_upload_srv,
-            'seuil_upload': upload_config.pretty_seuil,
-            }
+        # Testing purpose:
+        # destinataire = "your.mail@crans.org"
+        corps = mail_module.generate('upload_stats',
+            {
+                'from': expediteur,
+                'to': destinataire,
+                'upload_srv': fetched_upload_srv,
+                'seuil_upload': upload_config.pretty_seuil,
+            }).as_string()
 
         mail = smtplib.SMTP('localhost')
-        mail.sendmail(expediteur, expediteur, corps)
+        mail.sendmail(expediteur, destinataire, corps)
     else:
         print fetched_upload_srv