diff --git a/bda/models.py b/bda/models.py
index a14585ee..98ab622f 100644
--- a/bda/models.py
+++ b/bda/models.py
@@ -298,36 +298,35 @@ class SpectacleRevente(models.Model):
             # Envoie un mail au gagnant et au vendeur
             winner = random.choice(inscrits)
             self.soldTo = winner
+            datatuple = []
             context = {
                 'acheteur': winner.user,
                 'vendeur': seller.user,
                 'show': spectacle,
             }
-            send_custom_mail(
+            datatuple.append((
                 'bda-revente-winner',
+                context,
+                settings.MAIL_DATA['revente']['FROM'],
                 [winner.user.email],
-                context=context,
-                from_email=settings.MAIL_DATA['revente']['FROM']
-            )
-            send_custom_mail(
+            ))
+            datatuple.append((
                 'bda-revente-seller',
-                [seller.user.email],
-                context=context,
-                from_email=settings.MAIL_DATA['revente']['FROM']
-            )
+                context,
+                settings.MAIL_DATA['revente']['FROM'],
+                [seller.user.email]
+            ))
 
             # Envoie un mail aux perdants
-            datatuple = [(
-                'bda-revente-loser',
-                {
-                    'acheteur': inscrit.user,
-                    'vendeur': seller.user,
-                    'show': spectacle
-                },
-                settings.MAIL_DATA['revente']['FROM'],
-                [inscrit.user.email])
-                for inscrit in inscrits if inscrit != winner
-            ]
+            for inscrit in inscrits:
+                if inscrit != winner:
+                    context['acheteur'] = inscrit.user
+                    datatuple.append((
+                        'bda-revente-loser',
+                        context,
+                        settings.MAIL_DATA['revente']['FROM'],
+                        [inscrit.user.email]
+                    ))
             send_mass_custom_mail(datatuple)
         # Si personne ne veut de la place, elle part au shotgun
         else:
diff --git a/bda/templates/mails-rappel.html b/bda/templates/bda/mails-rappel.html
similarity index 84%
rename from bda/templates/mails-rappel.html
rename to bda/templates/bda/mails-rappel.html
index 3fc15fa2..a2821e28 100644
--- a/bda/templates/mails-rappel.html
+++ b/bda/templates/bda/mails-rappel.html
@@ -28,8 +28,12 @@
 <h3>Forme des mails</h3>
 
 <br />Une seule place<br /><br />
-<pre>{{ exemple_mail_1place }}</pre>
+{% for part in exemple_mail_1place %}
+<pre>{{ part }}</pre>
+{% endfor %}
 
 <br />Deux places<br /><br />
-<pre>{{ exemple_mail_2places }}</pre>
+{% for part in exemple_mail_2places %}
+<pre>{{ part }}</pre>
+{% endfor %}
 {% endblock %}
diff --git a/bda/views.py b/bda/views.py
index 4f0d717d..ad5fb490 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -466,7 +466,7 @@ def buy_revente(request, spectacle_id):
         }
         send_custom_mail(
             'bda-buy-shotgun',
-            [revente.seller.user.email],
+            recipient_list=[revente.seller.user.email],
             context=context,
             from_email='bda@ens.fr'
         )
@@ -575,7 +575,7 @@ def send_rappel(request, spectacle_id):
     # Demande de confirmation
     else:
         ctxt['sent'] = False
-    return render(request, "mails-rappel.html", ctxt)
+    return render(request, "bda/mails-rappel.html", ctxt)
 
 
 def descriptions_spectacles(request, tirage_id):
diff --git a/gestioncof/petits_cours_views.py b/gestioncof/petits_cours_views.py
index 973db315..18c715cf 100644
--- a/gestioncof/petits_cours_views.py
+++ b/gestioncof/petits_cours_views.py
@@ -155,7 +155,7 @@ def _generate_eleve_email(demande, proposed_for):
             render_custom_mail('petit-cours-mail-eleve', {
                 "demande": demande,
                 "matieres": matieres
-            })[1]
+            })
         )
         for user, matieres in proposed_for
     ]
diff --git a/gestioncof/templates/traitement_demande_petit_cours.html b/gestioncof/templates/traitement_demande_petit_cours.html
index d51f87b5..f533f0f1 100644
--- a/gestioncof/templates/traitement_demande_petit_cours.html
+++ b/gestioncof/templates/traitement_demande_petit_cours.html
@@ -30,10 +30,14 @@
     <h4>Mails pour les membres proposés :</h4>
     {% for proposeduser, mail in proposed_mails %}
         <h5>Pour {{ proposeduser }}:</h5>
-        <pre>{{ mail }}</pre>
+	{% for part in mail %}
+        <pre>{{ part }}</pre>
+	{% endfor %}
     {% endfor %}
     <h4>Mail pour l'auteur de la demande :</h4>
-    <pre style="margin-top: 15px;">{{ mainmail|safe }}</pre>
+    {% for part in mainmail %}
+    <pre style="margin-top: 15px;">{{ part|safe }}</pre>
+    {% endfor %}
     <input type="hidden" name="attribdata" value="{{ attribdata }}" />
     {% if redo %}<input type="hidden" name="redo" value="1" />{% endif %}
     <input class="btn btn-primary pull-right" type="submit" value="Valider le {% if redo %}re{% endif %}traitement de la demande" />