diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 45e0216..2e23da9 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platform Back\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-23 13:41+0000\n"
+"POT-Creation-Date: 2023-11-23 16:17+0000\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,18 +16,20 @@ msgid_plural "%d nouveaux webhooks ont été enregistrés avec succès."
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/mails/mailing-welcome.html:15
-msgid "Bienvenue chez BIMData !"
-msgstr "Willkommen bei BIMData!"
+#: templates/mails/mailing-welcome-subject.txt:2
+#, fuzzy
+#| msgid "Bienvenue sur la plateforme BIMData.io"
+msgid "Bienvenue sur la plateforme BIMData.io"
+msgstr "Willkommen auf der Plattform BIMData.io"
 
-#: templates/mails/mailing-welcome.html:129
+#: templates/mails/mailing-welcome.html:127
 #, python-format
 msgid "Nous sommes heureux de vous accueillir sur BIMData.io, %(user_name)s"
 msgstr ""
 "Wir freuen uns, Sie bei BIMData.io willkommen heißen zu dürfen, "
 "%(user_name)s!"
 
-#: templates/mails/mailing-welcome.html:150
+#: templates/mails/mailing-welcome.html:148
 msgid ""
 "Bienvenue sur la plateforme BIMData.io.<br /> Collaborez, gérez et priorisez "
 "votre travail, partout et à tout moment.<br /> Vous êtes prêt ? Allons-y !"
@@ -36,17 +38,17 @@ msgstr ""
 "jederzeit mit anderen zusammen, verwalten und priorisieren Sie Ihre Arbeit."
 "<br />Fertig? Los geht's!"
 
-#: templates/mails/mailing-welcome.html:185
-#: templates/mails/mailing-welcome.html:401
+#: templates/mails/mailing-welcome.html:183
+#: templates/mails/mailing-welcome.html:399
 msgid "Accéder à votre compte"
 msgstr "Auf Ihr Konto zugreifen"
 
-#: templates/mails/mailing-welcome.html:227
+#: templates/mails/mailing-welcome.html:225
 msgid "Bravo ! Vous rejoignez <br /> plus de 100 000 utilisateurs !"
 msgstr ""
 "Bravo! Sie werden Teil einer Community von <br /> über 100.000 Nutzern!"
 
-#: templates/mails/mailing-welcome.html:249
+#: templates/mails/mailing-welcome.html:247
 msgid ""
 "Des équipes de toutes tailles utilisent BIMData.io pour échanger et garder "
 "leurs collaborateurs synchronisés."
@@ -54,7 +56,7 @@ msgstr ""
 "Teams jeder Größe verwenden BIMData.io, um miteinander zu kommunizieren und "
 "alle Mitwirkenden über alles auf dem Laufenden zu halten."
 
-#: templates/mails/mailing-welcome.html:284
+#: templates/mails/mailing-welcome.html:282
 msgid ""
 "<strong>La collaboration au cœur de vos projets</strong><br /> Créez, gérez "
 "et faites évoluer facilement votre travail sur une seule plateforme. "
@@ -65,7 +67,7 @@ msgstr ""
 "einfach auf einer einzigen Plattform. Arbeiten Sie zusammen mit anderen an "
 "einem einzigen, gemeinsam genutzten virtuellen Arbeitsbereich."
 
-#: templates/mails/mailing-welcome.html:323
+#: templates/mails/mailing-welcome.html:321
 msgid ""
 "<strong>Visionnez en 1 click vos maquettes 2D et 3D</strong><br /> BIMData "
 "Viewer, et ses outils de mesures et coupes, est automatiquement intégré à la "
@@ -77,7 +79,7 @@ msgstr ""
 "automatisch in die Plattform integriert, sodass Sie Ihre IFC-Modelle mit nur "
 "einem Klick anzeigen können."
 
-#: templates/mails/mailing-welcome.html:362
+#: templates/mails/mailing-welcome.html:360
 msgid ""
 "<strong>Priorisez et caractérisez vos données</strong><br /> La Gestion "
 "Electronique des Documents (GED) vous permet de suivre, gérer et "
@@ -92,80 +94,80 @@ msgstr ""
 "anderen. Es ermöglicht Nutzern, Daten zu priorisieren und zu kennzeichnen, "
 "um sie besser zu interpretieren."
 
-#: templates/mails/notifications-bcf.html:16
-msgid "Notifications BFC"
+#: templates/mails/notifications-bcf-subject.txt:2
+msgid "Nouvelle notification BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:160
+#: templates/mails/notifications-bcf.html:158
 msgid "Ajout d’un nouveau BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:221
+#: templates/mails/notifications-bcf.html:219
 #, python-format
 msgid ""
 "<strong>%(email_author)s</strong> a créé un nouveau BCF dans le projet "
 "<strong>%(project_name)s</strong>."
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Description: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Pas de description renseignée"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Échéance: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Pas de date d'échéance"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Priorité: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Non défini"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Type: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Pas de type spécifié"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:335
-#: templates/mails/notifications-bcf.html:508
+#: templates/mails/notifications-bcf.html:333
+#: templates/mails/notifications-bcf.html:506
 msgid "Voir le BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:385
+#: templates/mails/notifications-bcf.html:383
 #, python-format
 msgid "%(email_author)s a créé un nouveau BCF dans le projet %(project_name)s."
 msgstr ""
 
-#: templates/mails/notifications-visa.html:16
-msgid "Notifications Visa"
+#: templates/mails/notifications-visa-subject.txt:2
+msgid "Nouvelle notification Visa"
 msgstr ""
 
-#: templates/mails/notifications-visa.html:160
+#: templates/mails/notifications-visa.html:158
 msgid "Ajout de nouveau visa"
 msgstr ""
 
-#: templates/mails/notifications-visa.html:203
+#: templates/mails/notifications-visa.html:201
 #, python-format
 msgid ""
 "<strong>%(firstname)s %(lastname)s</strong> a ajouté une nouvelle demande de "
@@ -175,20 +177,7 @@ msgid ""
 "14px\">%(deadline)s</strong>."
 msgstr ""
 
-#: templates/mails/notifications-visa.html:235
+#: templates/mails/notifications-visa.html:233
 msgid "Voir le projet"
 msgstr ""
 
-#: utils/mailer.py:16
-msgid "Nouvelle notification BCF"
-msgstr ""
-
-#: utils/mailer.py:17
-msgid "Nouvelle notification Visa"
-msgstr ""
-
-#: utils/mailer.py:18
-#, fuzzy, python-format
-#| msgid "Bienvenue sur la plateforme BIMData.io"
-msgid "Bienvenue sur la plateforme BIMData.io %(user_name)s"
-msgstr "Willkommen auf der Plattform BIMData.io  %(user_name)s"
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index d0427ef..2b4124e 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platform Back\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-23 13:41+0000\n"
+"POT-Creation-Date: 2023-11-23 16:17+0000\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,16 +16,18 @@ msgid_plural "%d nouveaux webhooks ont été enregistrés avec succès."
 msgstr[0] "%d new webhook has been successfully registered."
 msgstr[1] "%d new webhooks have been successfully registered."
 
-#: templates/mails/mailing-welcome.html:15
-msgid "Bienvenue chez BIMData !"
-msgstr "Welcome to BIMData!"
+#: templates/mails/mailing-welcome-subject.txt:2
+#, fuzzy
+#| msgid "Bienvenue sur la plateforme BIMData.io"
+msgid "Bienvenue sur la plateforme BIMData.io"
+msgstr "Welcome to BIMData.io Platform!"
 
-#: templates/mails/mailing-welcome.html:129
+#: templates/mails/mailing-welcome.html:127
 #, python-format
 msgid "Nous sommes heureux de vous accueillir sur BIMData.io, %(user_name)s"
 msgstr "We are happy to welcome you on BIMData.io, %(user_name)s"
 
-#: templates/mails/mailing-welcome.html:150
+#: templates/mails/mailing-welcome.html:148
 msgid ""
 "Bienvenue sur la plateforme BIMData.io.<br /> Collaborez, gérez et priorisez "
 "votre travail, partout et à tout moment.<br /> Vous êtes prêt ? Allons-y !"
@@ -33,16 +35,16 @@ msgstr ""
 "Welcome on BIMData Platform.<br /> Collaborate, manage and prioritize your "
 "work, anytime, anywhere.<br /> Are you ready? Let's go!"
 
-#: templates/mails/mailing-welcome.html:185
-#: templates/mails/mailing-welcome.html:401
+#: templates/mails/mailing-welcome.html:183
+#: templates/mails/mailing-welcome.html:399
 msgid "Accéder à votre compte"
 msgstr "Login to your account"
 
-#: templates/mails/mailing-welcome.html:227
+#: templates/mails/mailing-welcome.html:225
 msgid "Bravo ! Vous rejoignez <br /> plus de 100 000 utilisateurs !"
 msgstr "Congrats! You've just joined <br /> over 100,000 teams like yours!"
 
-#: templates/mails/mailing-welcome.html:249
+#: templates/mails/mailing-welcome.html:247
 msgid ""
 "Des équipes de toutes tailles utilisent BIMData.io pour échanger et garder "
 "leurs collaborateurs synchronisés."
@@ -50,7 +52,7 @@ msgstr ""
 "Teams of all sizes are using BIMData.io to collaborate and keep their teams "
 "in sync."
 
-#: templates/mails/mailing-welcome.html:284
+#: templates/mails/mailing-welcome.html:282
 msgid ""
 "<strong>La collaboration au cœur de vos projets</strong><br /> Créez, gérez "
 "et faites évoluer facilement votre travail sur une seule plateforme. "
@@ -60,7 +62,7 @@ msgstr ""
 "create, manage and enhance your workflow in one place. Collaborate in one "
 "shared virtual space. "
 
-#: templates/mails/mailing-welcome.html:323
+#: templates/mails/mailing-welcome.html:321
 msgid ""
 "<strong>Visionnez en 1 click vos maquettes 2D et 3D</strong><br /> BIMData "
 "Viewer, et ses outils de mesures et coupes, est automatiquement intégré à la "
@@ -71,7 +73,7 @@ msgstr ""
 "Viewer, along with its measure and section tools, is fully integrated in the "
 "platform, so you can visualize your IFC models in just one click."
 
-#: templates/mails/mailing-welcome.html:362
+#: templates/mails/mailing-welcome.html:360
 msgid ""
 "<strong>Priorisez et caractérisez vos données</strong><br /> La Gestion "
 "Electronique des Documents (GED) vous permet de suivre, gérer et "
@@ -84,15 +86,15 @@ msgstr ""
 "project data. A true collaboration and project management tool, the EDM "
 "allows you to prioritize and characterize data in order to better analyze it."
 
-#: templates/mails/notifications-bcf.html:16
-msgid "Notifications BFC"
-msgstr "BFC Notifications"
+#: templates/mails/notifications-bcf-subject.txt:2
+msgid "Nouvelle notification BCF"
+msgstr "New BCF notification"
 
-#: templates/mails/notifications-bcf.html:160
+#: templates/mails/notifications-bcf.html:158
 msgid "Ajout d’un nouveau BCF"
 msgstr "New BCF added"
 
-#: templates/mails/notifications-bcf.html:221
+#: templates/mails/notifications-bcf.html:219
 #, python-format
 msgid ""
 "<strong>%(email_author)s</strong> a créé un nouveau BCF dans le projet "
@@ -101,66 +103,66 @@ msgstr ""
 "<strong>%(email_author)s</strong> has created a new BCF in the project "
 "<strong>%(project_name)s</strong>."
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Description: "
 msgstr "Description: "
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Pas de description renseignée"
 msgstr "No description provided"
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Échéance: "
 msgstr "Due date: "
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Pas de date d'échéance"
 msgstr "No due date"
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Priorité: "
 msgstr "Priority: "
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Non défini"
 msgstr "Not defined"
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Type: "
 msgstr "Type: "
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Pas de type spécifié"
 msgstr "No type specified"
 
-#: templates/mails/notifications-bcf.html:335
-#: templates/mails/notifications-bcf.html:508
+#: templates/mails/notifications-bcf.html:333
+#: templates/mails/notifications-bcf.html:506
 msgid "Voir le BCF"
 msgstr "View BCF"
 
-#: templates/mails/notifications-bcf.html:385
+#: templates/mails/notifications-bcf.html:383
 #, python-format
 msgid "%(email_author)s a créé un nouveau BCF dans le projet %(project_name)s."
 msgstr ""
 "%(email_author)s has created a new BCF in the project %(project_name)s."
 
-#: templates/mails/notifications-visa.html:16
-msgid "Notifications Visa"
-msgstr "Validation Notifications"
+#: templates/mails/notifications-visa-subject.txt:2
+msgid "Nouvelle notification Visa"
+msgstr "New validation notification"
 
-#: templates/mails/notifications-visa.html:160
+#: templates/mails/notifications-visa.html:158
 msgid "Ajout de nouveau visa"
 msgstr "New validation added"
 
-#: templates/mails/notifications-visa.html:203
+#: templates/mails/notifications-visa.html:201
 #, python-format
 msgid ""
 "<strong>%(firstname)s %(lastname)s</strong> a ajouté une nouvelle demande de "
@@ -174,20 +176,7 @@ msgstr ""
 "#2f374a; font-size: 14px\">%(document_name)s</strong> to be validated before "
 "<strong style=\"color: #2f374a; font-size: 14px\">%(deadline)s</strong>."
 
-#: templates/mails/notifications-visa.html:235
+#: templates/mails/notifications-visa.html:233
 msgid "Voir le projet"
 msgstr "View project"
 
-#: utils/mailer.py:16
-msgid "Nouvelle notification BCF"
-msgstr "New BCF notification"
-
-#: utils/mailer.py:17
-msgid "Nouvelle notification Visa"
-msgstr "New validation notification"
-
-#: utils/mailer.py:18
-#, fuzzy, python-format
-#| msgid "Bienvenue sur la plateforme BIMData.io"
-msgid "Bienvenue sur la plateforme BIMData.io %(user_name)s"
-msgstr "Welcome to BIMData.io Platform  %(user_name)s!"
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index a1757de..ba2a635 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platform Back\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-23 13:41+0000\n"
+"POT-Creation-Date: 2023-11-23 16:17+0000\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,17 +16,19 @@ msgid_plural "%d nouveaux webhooks ont été enregistrés avec succès."
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/mails/mailing-welcome.html:15
-msgid "Bienvenue chez BIMData !"
-msgstr "¡Te damos la bienvenida a BIMData!"
+#: templates/mails/mailing-welcome-subject.txt:2
+#, fuzzy
+#| msgid "Bienvenue sur la plateforme BIMData.io"
+msgid "Bienvenue sur la plateforme BIMData.io"
+msgstr "Te damos la bienvenida a la plataforma BIMData.io"
 
-#: templates/mails/mailing-welcome.html:129
+#: templates/mails/mailing-welcome.html:127
 #, fuzzy, python-format
 #| msgid "Nous sommes heureux de vous accueillir sur BIMData.io, %(user_name)s"
 msgid "Nous sommes heureux de vous accueillir sur BIMData.io, %(user_name)s"
 msgstr "Nos complace recibirte en BIMData.io, % (user_name)s"
 
-#: templates/mails/mailing-welcome.html:150
+#: templates/mails/mailing-welcome.html:148
 msgid ""
 "Bienvenue sur la plateforme BIMData.io.<br /> Collaborez, gérez et priorisez "
 "votre travail, partout et à tout moment.<br /> Vous êtes prêt ? Allons-y !"
@@ -35,16 +37,16 @@ msgstr ""
 "gestionar y ordenar tu trabajo, en todo momento y lugar.<br /> ¿Listos? "
 "¡Vamos!"
 
-#: templates/mails/mailing-welcome.html:185
-#: templates/mails/mailing-welcome.html:401
+#: templates/mails/mailing-welcome.html:183
+#: templates/mails/mailing-welcome.html:399
 msgid "Accéder à votre compte"
 msgstr "Accede a tu cuenta"
 
-#: templates/mails/mailing-welcome.html:227
+#: templates/mails/mailing-welcome.html:225
 msgid "Bravo ! Vous rejoignez <br /> plus de 100 000 utilisateurs !"
 msgstr "¡Felicitaciones! ¡Te acabas de unir a <br /> más de 100 000 usuarios!"
 
-#: templates/mails/mailing-welcome.html:249
+#: templates/mails/mailing-welcome.html:247
 msgid ""
 "Des équipes de toutes tailles utilisent BIMData.io pour échanger et garder "
 "leurs collaborateurs synchronisés."
@@ -52,7 +54,7 @@ msgstr ""
 "Equipos de distintos tamaños utilizan BIMData.io para intercambiar "
 "información y mantener a sus colaboradores sincronizados."
 
-#: templates/mails/mailing-welcome.html:284
+#: templates/mails/mailing-welcome.html:282
 msgid ""
 "<strong>La collaboration au cœur de vos projets</strong><br /> Créez, gérez "
 "et faites évoluer facilement votre travail sur une seule plateforme. "
@@ -62,7 +64,7 @@ msgstr ""
 "crear, administrar y hacer crecer tu trabajo fácilmente, en una sola "
 "plataforma. Colabora en un único espacio de trabajo virtual compartido."
 
-#: templates/mails/mailing-welcome.html:323
+#: templates/mails/mailing-welcome.html:321
 msgid ""
 "<strong>Visionnez en 1 click vos maquettes 2D et 3D</strong><br /> BIMData "
 "Viewer, et ses outils de mesures et coupes, est automatiquement intégré à la "
@@ -74,7 +76,7 @@ msgstr ""
 "integrados a la plataforma, te permiten visualizar tus modelos IFC en un "
 "solo clic."
 
-#: templates/mails/mailing-welcome.html:362
+#: templates/mails/mailing-welcome.html:360
 msgid ""
 "<strong>Priorisez et caractérisez vos données</strong><br /> La Gestion "
 "Electronique des Documents (GED) vous permet de suivre, gérer et "
@@ -88,80 +90,80 @@ msgstr ""
 "verdadera herramienta de colaboración y gestión de proyectos que permite "
 "ordenar y caracterizar los datos para interpretarlos mejor."
 
-#: templates/mails/notifications-bcf.html:16
-msgid "Notifications BFC"
+#: templates/mails/notifications-bcf-subject.txt:2
+msgid "Nouvelle notification BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:160
+#: templates/mails/notifications-bcf.html:158
 msgid "Ajout d’un nouveau BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:221
+#: templates/mails/notifications-bcf.html:219
 #, python-format
 msgid ""
 "<strong>%(email_author)s</strong> a créé un nouveau BCF dans le projet "
 "<strong>%(project_name)s</strong>."
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Description: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Pas de description renseignée"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Échéance: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Pas de date d'échéance"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Priorité: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Non défini"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Type: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Pas de type spécifié"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:335
-#: templates/mails/notifications-bcf.html:508
+#: templates/mails/notifications-bcf.html:333
+#: templates/mails/notifications-bcf.html:506
 msgid "Voir le BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:385
+#: templates/mails/notifications-bcf.html:383
 #, python-format
 msgid "%(email_author)s a créé un nouveau BCF dans le projet %(project_name)s."
 msgstr ""
 
-#: templates/mails/notifications-visa.html:16
-msgid "Notifications Visa"
+#: templates/mails/notifications-visa-subject.txt:2
+msgid "Nouvelle notification Visa"
 msgstr ""
 
-#: templates/mails/notifications-visa.html:160
+#: templates/mails/notifications-visa.html:158
 msgid "Ajout de nouveau visa"
 msgstr ""
 
-#: templates/mails/notifications-visa.html:203
+#: templates/mails/notifications-visa.html:201
 #, python-format
 msgid ""
 "<strong>%(firstname)s %(lastname)s</strong> a ajouté une nouvelle demande de "
@@ -171,20 +173,9 @@ msgid ""
 "14px\">%(deadline)s</strong>."
 msgstr ""
 
-#: templates/mails/notifications-visa.html:235
+#: templates/mails/notifications-visa.html:233
 msgid "Voir le projet"
 msgstr ""
 
-#: utils/mailer.py:16
-msgid "Nouvelle notification BCF"
-msgstr ""
-
-#: utils/mailer.py:17
-msgid "Nouvelle notification Visa"
-msgstr ""
-
-#: utils/mailer.py:18
-#, fuzzy, python-format
-#| msgid "Bienvenue sur la plateforme BIMData.io"
-msgid "Bienvenue sur la plateforme BIMData.io %(user_name)s"
-msgstr "Te damos la bienvenida a la plataforma BIMData.io  %(user_name)s"
+#~ msgid "Bienvenue chez BIMData !"
+#~ msgstr "¡Te damos la bienvenida a BIMData!"
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 65116e4..79ba651 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-23 13:41+0000\n"
+"POT-Creation-Date: 2023-11-23 16:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,16 +25,18 @@ msgid_plural "%d nouveaux webhooks ont été enregistrés avec succès."
 msgstr[0] "%d nouveau webhook a été enregistré avec succès."
 msgstr[1] "%d nouveaux webhooks ont été enregistrés avec succès."
 
-#: templates/mails/mailing-welcome.html:15
-msgid "Bienvenue chez BIMData !"
-msgstr "Bienvenue chez BIMData !"
+#: templates/mails/mailing-welcome-subject.txt:2
+#, fuzzy
+#| msgid "Bienvenue sur la plateforme BIMData.io"
+msgid "Bienvenue sur la plateforme BIMData.io"
+msgstr "Bienvenue sur la plateforme BIMData.io"
 
-#: templates/mails/mailing-welcome.html:129
+#: templates/mails/mailing-welcome.html:127
 #, python-format
 msgid "Nous sommes heureux de vous accueillir sur BIMData.io, %(user_name)s"
 msgstr "Nous sommes heureux de vous accueillir sur BIMData.io, %(user_name)s"
 
-#: templates/mails/mailing-welcome.html:150
+#: templates/mails/mailing-welcome.html:148
 msgid ""
 "Bienvenue sur la plateforme BIMData.io.<br /> Collaborez, gérez et priorisez "
 "votre travail, partout et à tout moment.<br /> Vous êtes prêt ? Allons-y !"
@@ -42,16 +44,16 @@ msgstr ""
 "Bienvenue sur la plateforme BIMData.io.<br /> Collaborez, gérez et priorisez "
 "votre travail, partout et à tout moment.<br /> Vous êtes prêt ? Allons-y !"
 
-#: templates/mails/mailing-welcome.html:185
-#: templates/mails/mailing-welcome.html:401
+#: templates/mails/mailing-welcome.html:183
+#: templates/mails/mailing-welcome.html:399
 msgid "Accéder à votre compte"
 msgstr "Accéder à votre compte"
 
-#: templates/mails/mailing-welcome.html:227
+#: templates/mails/mailing-welcome.html:225
 msgid "Bravo ! Vous rejoignez <br /> plus de 100 000 utilisateurs !"
 msgstr "Bravo ! Vous rejoignez <br /> plus de 100 000 utilisateurs !"
 
-#: templates/mails/mailing-welcome.html:249
+#: templates/mails/mailing-welcome.html:247
 msgid ""
 "Des équipes de toutes tailles utilisent BIMData.io pour échanger et garder "
 "leurs collaborateurs synchronisés."
@@ -59,7 +61,7 @@ msgstr ""
 "Des équipes de toutes tailles utilisent BIMData.io pour échanger et garder "
 "leurs collaborateurs synchronisés."
 
-#: templates/mails/mailing-welcome.html:284
+#: templates/mails/mailing-welcome.html:282
 msgid ""
 "<strong>La collaboration au cœur de vos projets</strong><br /> Créez, gérez "
 "et faites évoluer facilement votre travail sur une seule plateforme. "
@@ -69,7 +71,7 @@ msgstr ""
 "et faites évoluer facilement votre travail sur une seule plateforme. "
 "Collaborez sur un seul espace de travail virtuel partagé."
 
-#: templates/mails/mailing-welcome.html:323
+#: templates/mails/mailing-welcome.html:321
 msgid ""
 "<strong>Visionnez en 1 click vos maquettes 2D et 3D</strong><br /> BIMData "
 "Viewer, et ses outils de mesures et coupes, est automatiquement intégré à la "
@@ -81,7 +83,7 @@ msgstr ""
 "plateforme, vous pouvez donc visualiser vos maquettes IFC en 1 click "
 "seulement."
 
-#: templates/mails/mailing-welcome.html:362
+#: templates/mails/mailing-welcome.html:360
 msgid ""
 "<strong>Priorisez et caractérisez vos données</strong><br /> La Gestion "
 "Electronique des Documents (GED) vous permet de suivre, gérer et "
@@ -95,17 +97,15 @@ msgstr ""
 "collaboration et gestion de projet, la GED vous permet de prioriser et "
 "caractériser les données afin de mieux les interpréter."
 
-#: templates/mails/notifications-bcf.html:16
-#, fuzzy
-#| msgid "Notifications"
-msgid "Notifications BFC"
-msgstr "Notifications"
+#: templates/mails/notifications-bcf-subject.txt:2
+msgid "Nouvelle notification BCF"
+msgstr "Nouvelle notification BCF"
 
-#: templates/mails/notifications-bcf.html:160
+#: templates/mails/notifications-bcf.html:158
 msgid "Ajout d’un nouveau BCF"
 msgstr "Ajout d’un nouveau BCF"
 
-#: templates/mails/notifications-bcf.html:221
+#: templates/mails/notifications-bcf.html:219
 #, fuzzy, python-format
 #| msgid ""
 #| "%(email_author)s a créée un nouveau BCF dans le projet %(project_name)s."
@@ -116,54 +116,54 @@ msgstr ""
 "<strong>%(email_author)s</strong> a créée un nouveau BCF dans le projet "
 "<strong>%(project_name)s</strong>."
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Description: "
 msgstr "Description: "
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Pas de description renseignée"
 msgstr "Pas de description renseignée"
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Échéance: "
 msgstr "Échéance: "
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 #, fuzzy
 #| msgid "Pas d'échéance"
 msgid "Pas de date d'échéance"
 msgstr "Pas de date d'échéance"
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Priorité: "
 msgstr "Priorité: "
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Non défini"
 msgstr "Non défini"
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Type: "
 msgstr "Type: "
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Pas de type spécifié"
 msgstr "Pas de type spécifié"
 
-#: templates/mails/notifications-bcf.html:335
-#: templates/mails/notifications-bcf.html:508
+#: templates/mails/notifications-bcf.html:333
+#: templates/mails/notifications-bcf.html:506
 msgid "Voir le BCF"
 msgstr "Voir le BCF"
 
-#: templates/mails/notifications-bcf.html:385
+#: templates/mails/notifications-bcf.html:383
 #, fuzzy, python-format
 #| msgid ""
 #| "%(email_author)s a créée un nouveau BCF dans le projet %(project_name)s."
@@ -171,17 +171,15 @@ msgid "%(email_author)s a créé un nouveau BCF dans le projet %(project_name)s.
 msgstr ""
 "%(email_author)s a créée un nouveau BCF dans le projet %(project_name)s."
 
-#: templates/mails/notifications-visa.html:16
-#, fuzzy
-#| msgid "Notifications"
-msgid "Notifications Visa"
-msgstr "Notifications Visa"
+#: templates/mails/notifications-visa-subject.txt:2
+msgid "Nouvelle notification Visa"
+msgstr "Nouvelle notification Visa"
 
-#: templates/mails/notifications-visa.html:160
+#: templates/mails/notifications-visa.html:158
 msgid "Ajout de nouveau visa"
 msgstr "Ajout de nouveau visa"
 
-#: templates/mails/notifications-visa.html:203
+#: templates/mails/notifications-visa.html:201
 #, python-format
 msgid ""
 "<strong>%(firstname)s %(lastname)s</strong> a ajouté une nouvelle demande de "
@@ -196,20 +194,7 @@ msgstr ""
 "valider avant le <strong style=\"color: #2f374a; font-size: "
 "14px\">%(deadline)s</strong>."
 
-#: templates/mails/notifications-visa.html:235
+#: templates/mails/notifications-visa.html:233
 msgid "Voir le projet"
 msgstr "Voir le projet"
 
-#: utils/mailer.py:16
-msgid "Nouvelle notification BCF"
-msgstr "Nouvelle notification BCF"
-
-#: utils/mailer.py:17
-msgid "Nouvelle notification Visa"
-msgstr "Nouvelle notification Visa"
-
-#: utils/mailer.py:18
-#, fuzzy, python-format
-#| msgid "Bienvenue sur la plateforme BIMData.io"
-msgid "Bienvenue sur la plateforme BIMData.io %(user_name)s"
-msgstr "Bienvenue sur la plateforme BIMData.io"
diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po
index 4d0f026..8d88a28 100644
--- a/locale/it/LC_MESSAGES/django.po
+++ b/locale/it/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platform Back\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-23 13:41+0000\n"
+"POT-Creation-Date: 2023-11-23 16:17+0000\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,16 +16,18 @@ msgid_plural "%d nouveaux webhooks ont été enregistrés avec succès."
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/mails/mailing-welcome.html:15
-msgid "Bienvenue chez BIMData !"
-msgstr "Benvenuto su BIMData!"
+#: templates/mails/mailing-welcome-subject.txt:2
+#, fuzzy
+#| msgid "Bienvenue sur la plateforme BIMData.io"
+msgid "Bienvenue sur la plateforme BIMData.io"
+msgstr "Benvenuto sulla piattaforma BIMData.io!"
 
-#: templates/mails/mailing-welcome.html:129
+#: templates/mails/mailing-welcome.html:127
 #, python-format
 msgid "Nous sommes heureux de vous accueillir sur BIMData.io, %(user_name)s"
 msgstr "Siamo lieti di darti il benvenuto su BIMData, %(user_name)s"
 
-#: templates/mails/mailing-welcome.html:150
+#: templates/mails/mailing-welcome.html:148
 msgid ""
 "Bienvenue sur la plateforme BIMData.io.<br /> Collaborez, gérez et priorisez "
 "votre travail, partout et à tout moment.<br /> Vous êtes prêt ? Allons-y !"
@@ -34,18 +36,18 @@ msgstr ""
 "le priorità del tuo lavoro in qualsiasi momento, ovunque.<br /> Sei pronto? "
 "Andiamo!"
 
-#: templates/mails/mailing-welcome.html:185
-#: templates/mails/mailing-welcome.html:401
+#: templates/mails/mailing-welcome.html:183
+#: templates/mails/mailing-welcome.html:399
 msgid "Accéder à votre compte"
 msgstr "Accedi al tuo account"
 
-#: templates/mails/mailing-welcome.html:227
+#: templates/mails/mailing-welcome.html:225
 msgid "Bravo ! Vous rejoignez <br /> plus de 100 000 utilisateurs !"
 msgstr ""
 "Congratulazioni! Ti sei appena unito a <br /> più di 100.000 team come il "
 "tuo!"
 
-#: templates/mails/mailing-welcome.html:249
+#: templates/mails/mailing-welcome.html:247
 msgid ""
 "Des équipes de toutes tailles utilisent BIMData.io pour échanger et garder "
 "leurs collaborateurs synchronisés."
@@ -53,7 +55,7 @@ msgstr ""
 "I team di tutte le dimensioni usano BIMData.io per collaborare e mantenere "
 "sincronizzati i propri team."
 
-#: templates/mails/mailing-welcome.html:284
+#: templates/mails/mailing-welcome.html:282
 msgid ""
 "<strong>La collaboration au cœur de vos projets</strong><br /> Créez, gérez "
 "et faites évoluer facilement votre travail sur une seule plateforme. "
@@ -63,7 +65,7 @@ msgstr ""
 "gestisci e migliora con facilità il tuo flusso di lavoro in un solo posto. "
 "Collabora in uno spazio virtuale condiviso."
 
-#: templates/mails/mailing-welcome.html:323
+#: templates/mails/mailing-welcome.html:321
 msgid ""
 "<strong>Visionnez en 1 click vos maquettes 2D et 3D</strong><br /> BIMData "
 "Viewer, et ses outils de mesures et coupes, est automatiquement intégré à la "
@@ -75,7 +77,7 @@ msgstr ""
 "è completamente integrato nella piattaforma permettendoti di visualizzare i "
 "tuoi modelli IFC con un solo clic."
 
-#: templates/mails/mailing-welcome.html:362
+#: templates/mails/mailing-welcome.html:360
 msgid ""
 "<strong>Priorisez et caractérisez vos données</strong><br /> La Gestion "
 "Electronique des Documents (GED) vous permet de suivre, gérer et "
@@ -89,80 +91,80 @@ msgstr ""
 "collaborazione e di gestione, l'EDM ti permette di stabilire le priorità e "
 "definire i dati per poterli analizzare al meglio."
 
-#: templates/mails/notifications-bcf.html:16
-msgid "Notifications BFC"
+#: templates/mails/notifications-bcf-subject.txt:2
+msgid "Nouvelle notification BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:160
+#: templates/mails/notifications-bcf.html:158
 msgid "Ajout d’un nouveau BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:221
+#: templates/mails/notifications-bcf.html:219
 #, python-format
 msgid ""
 "<strong>%(email_author)s</strong> a créé un nouveau BCF dans le projet "
 "<strong>%(project_name)s</strong>."
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Description: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:259
-#: templates/mails/notifications-bcf.html:427
+#: templates/mails/notifications-bcf.html:257
+#: templates/mails/notifications-bcf.html:425
 msgid "Pas de description renseignée"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Échéance: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:277
-#: templates/mails/notifications-bcf.html:441
+#: templates/mails/notifications-bcf.html:275
+#: templates/mails/notifications-bcf.html:439
 msgid "Pas de date d'échéance"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Priorité: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:291
-#: templates/mails/notifications-bcf.html:455
+#: templates/mails/notifications-bcf.html:289
+#: templates/mails/notifications-bcf.html:453
 msgid "Non défini"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Type: "
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:305
-#: templates/mails/notifications-bcf.html:469
+#: templates/mails/notifications-bcf.html:303
+#: templates/mails/notifications-bcf.html:467
 msgid "Pas de type spécifié"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:335
-#: templates/mails/notifications-bcf.html:508
+#: templates/mails/notifications-bcf.html:333
+#: templates/mails/notifications-bcf.html:506
 msgid "Voir le BCF"
 msgstr ""
 
-#: templates/mails/notifications-bcf.html:385
+#: templates/mails/notifications-bcf.html:383
 #, python-format
 msgid "%(email_author)s a créé un nouveau BCF dans le projet %(project_name)s."
 msgstr ""
 
-#: templates/mails/notifications-visa.html:16
-msgid "Notifications Visa"
+#: templates/mails/notifications-visa-subject.txt:2
+msgid "Nouvelle notification Visa"
 msgstr ""
 
-#: templates/mails/notifications-visa.html:160
+#: templates/mails/notifications-visa.html:158
 msgid "Ajout de nouveau visa"
 msgstr ""
 
-#: templates/mails/notifications-visa.html:203
+#: templates/mails/notifications-visa.html:201
 #, python-format
 msgid ""
 "<strong>%(firstname)s %(lastname)s</strong> a ajouté une nouvelle demande de "
@@ -172,20 +174,7 @@ msgid ""
 "14px\">%(deadline)s</strong>."
 msgstr ""
 
-#: templates/mails/notifications-visa.html:235
+#: templates/mails/notifications-visa.html:233
 msgid "Voir le projet"
 msgstr ""
 
-#: utils/mailer.py:16
-msgid "Nouvelle notification BCF"
-msgstr ""
-
-#: utils/mailer.py:17
-msgid "Nouvelle notification Visa"
-msgstr ""
-
-#: utils/mailer.py:18
-#, fuzzy, python-format
-#| msgid "Bienvenue sur la plateforme BIMData.io"
-msgid "Bienvenue sur la plateforme BIMData.io %(user_name)s"
-msgstr "Benvenuto sulla piattaforma BIMData.io  %(user_name)s!"
diff --git a/templates/mails/mailing-welcome-subject.txt b/templates/mails/mailing-welcome-subject.txt
new file mode 100644
index 0000000..4261f0d
--- /dev/null
+++ b/templates/mails/mailing-welcome-subject.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% trans "Bienvenue sur la plateforme BIMData.io" %}
\ No newline at end of file
diff --git a/templates/mails/mailing-welcome.html b/templates/mails/mailing-welcome.html
index df7be22..9946a31 100644
--- a/templates/mails/mailing-welcome.html
+++ b/templates/mails/mailing-welcome.html
@@ -12,8 +12,6 @@
     <!-- google WEBFONT : Roboto -->
     <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" />
 
-    <title>{% trans "Bienvenue chez BIMData !" %}</title>
-
     <style type="text/css">
       @media only screen and (max-width: 360px) {
         table[class="container_table"] {
diff --git a/templates/mails/notifications-bcf-subject.txt b/templates/mails/notifications-bcf-subject.txt
new file mode 100644
index 0000000..21de88d
--- /dev/null
+++ b/templates/mails/notifications-bcf-subject.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% trans "Nouvelle notification BCF" %}
\ No newline at end of file
diff --git a/templates/mails/notifications-bcf.html b/templates/mails/notifications-bcf.html
index e9758a7..109b4dd 100644
--- a/templates/mails/notifications-bcf.html
+++ b/templates/mails/notifications-bcf.html
@@ -13,8 +13,6 @@
     <!-- google WEBFONT : Roboto -->
     <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" />
 
-    <title>{% trans "Notifications BFC" %}</title>
-
     <style type="text/css">
       @media only screen and (max-width: 480px) {
         /* style TABLE */
diff --git a/templates/mails/notifications-visa-subject.txt b/templates/mails/notifications-visa-subject.txt
new file mode 100644
index 0000000..71f4fce
--- /dev/null
+++ b/templates/mails/notifications-visa-subject.txt
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% trans "Nouvelle notification Visa" %}
\ No newline at end of file
diff --git a/templates/mails/notifications-visa.html b/templates/mails/notifications-visa.html
index f1c0b41..b05ec05 100644
--- a/templates/mails/notifications-visa.html
+++ b/templates/mails/notifications-visa.html
@@ -13,8 +13,6 @@
     <!-- google WEBFONT : Roboto -->
     <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" />
 
-    <title>{% trans "Notifications Visa" %}</title>
-
     <style type="text/css">
       @media only screen and (max-width: 480px) {
         /* style TABLE */
diff --git a/utils/mailer.py b/utils/mailer.py
index c9abf83..1d509a0 100644
--- a/utils/mailer.py
+++ b/utils/mailer.py
@@ -5,20 +5,10 @@
 from django.core.mail import get_connection
 from django.template.loader import render_to_string
 from django.utils import translation
-from django.utils.translation import gettext_lazy as _
 
 logger = logging.getLogger("django")
 
 
-def subjects(template_name):
-    subs = {
-        "notifications-bcf": _("Nouvelle notification BCF"),
-        "notifications-visa": _("Nouvelle notification Visa"),
-        "mailing-welcome": _("Bienvenue sur la plateforme BIMData.io %(user_name)s"),
-    }
-    return subs[template_name]
-
-
 # @params user_ids: a list {email, firstname, lastname, language}
 def send_mail(
     template_name, content, users, language=settings.LANGUAGE_CODE, fail_silently=True
@@ -35,7 +25,7 @@ def send_mail(
     content["bimdata_url"] = settings.PLATFORM_URL
 
     with translation.override(language):
-        subject = subjects(template_name) % content
+        subject = render_to_string(f"mails/{template_name}-subject.txt", content)
         html_content = render_to_string(f"mails/{template_name}.html", content)
     if settings.APP_EMAIL_HOST:
         connection = get_connection(