diff --git a/bda/models.py b/bda/models.py
index 4559a322..0debec36 100644
--- a/bda/models.py
+++ b/bda/models.py
@@ -123,8 +123,9 @@ class Spectacle(models.Model):
                     'show': self})
             mail_tot = mail.EmailMessage(
                     mail_object, mail_body,
-                    settings.RAPPEL_FROM, [member[2]],
-                    [], headers={'Reply-To': settings.RAPPEL_REPLY_TO})
+                    settings.MAIL_DATA['rappels']['FROM'], [member[2]],
+                    [], headers={
+                        'Reply-To': settings.MAIL_DATA['rappels']['REPLYTO']})
             mails_to_send.append(mail_tot)
         # On envoie les mails
         connection = mail.get_connection()
@@ -283,8 +284,10 @@ class SpectacleRevente(models.Model):
                     'domain': Site.objects.get_current().domain})
             mail_tot = mail.EmailMessage(
                     mail_object, mail_body,
-                    settings.REVENTE_FROM, [participant.user.email],
-                    [], headers={'Reply-To': settings.REVENTE_REPLY_TO})
+                    settings.MAIL_DATA['revente']['FROM'],
+                    [participant.user.email],
+                    [], headers={
+                        'Reply-To': settings.MAIL_DATA['revente']['REPLYTO']})
             mails_to_send.append(mail_tot)
 
         connection = mail.get_connection()
@@ -305,8 +308,10 @@ class SpectacleRevente(models.Model):
                     'mail': self.attribution.participant.user.email})
             mail_tot = mail.EmailMessage(
                     mail_object, mail_body,
-                    settings.REVENTE_FROM, [participant.user.email],
-                    [], headers={'Reply-To': settings.REVENTE_REPLY_TO})
+                    settings.MAIL_DATA['revente']['FROM'],
+                    [participant.user.email],
+                    [], headers={
+                        'Reply-To': settings.MAIL_DATA['revente']['REPLYTO']})
             mails_to_send.append(mail_tot)
 
         connection = mail.get_connection()
diff --git a/cof/settings_dev.py b/cof/settings_dev.py
index 0ed4a618..b2bda35d 100644
--- a/cof/settings_dev.py
+++ b/cof/settings_dev.py
@@ -145,15 +145,18 @@ ADMIN_MEDIA_PREFIX = '/static/grappelli/'
 GRAPPELLI_ADMIN_HEADLINE = "GestioCOF"
 GRAPPELLI_ADMIN_TITLE = "<a href=\"/\">GestioCOF</a>"
 
-PETITS_COURS_FROM = "Le COF <cof@ens.fr>"
-PETITS_COURS_BCC = "archivescof@gmail.com"
-PETITS_COURS_REPLYTO = "cof@ens.fr"
-
-RAPPEL_FROM = 'Le BdA <bda@ens.fr>'
-RAPPEL_REPLY_TO = RAPPEL_FROM
-
-REVENTE_FROM = 'BdA-Revente <bda-revente@ens.fr>'
-REVENTE_REPLY_TO = REVENTE_FROM
+MAIL_DATA = {
+    'petits_cours': {
+        'FROM': "Le COF <cof@ens.fr>",
+        'BCC': "archivescof@gmail.com",
+        'REPLYTO': "cof@ens.fr"},
+    'rappels': {
+        'FROM': 'Le BdA <bda@ens.fr>',
+        'REPLYTO': 'Le BdA <bda@ens.fr>'},
+    'revente': {
+        'FROM': 'BdA-Revente <bda-revente@ens.fr>',
+        'REPLYTO': 'BdA-Revente <bda-revente@ens.fr>'},
+}
 
 LOGIN_URL = "/gestion/login"
 LOGIN_REDIRECT_URL = "/gestion/"
diff --git a/gestioncof/petits_cours_views.py b/gestioncof/petits_cours_views.py
index 1a31115d..e9fe511e 100644
--- a/gestioncof/petits_cours_views.py
+++ b/gestioncof/petits_cours_views.py
@@ -282,9 +282,9 @@ def _traitement_post(request, demande):
                                {"proposals": proposals_list,
                                 "unsatisfied": unsatisfied,
                                 "extra": extra})
-    frommail = settings.PETITS_COURS_FROM
-    bccaddress = settings.PETITS_COURS_BCC
-    replyto = settings.PETITS_COURS_REPLYTO
+    frommail = settings.MAIL_DATA['petits_cours']['FROM']
+    bccaddress = settings.MAIL_DATA['petits_cours']['BCC']
+    replyto = settings.MAIL_DATA['petits_cours']['REPLYTO']
     mails_to_send = []
     for (user, msg) in proposed_mails:
         msg = EmailMessage("Petits cours ENS par le COF", msg,