diff --git a/canapEPFL/cible.php b/canapEPFL/cible.php
index 872b7ed8c1f47726b04a68124ca5c2fadd8e6ee2..c28191cb3aa20e7a312581c519384b1381840eb3 100644
--- a/canapEPFL/cible.php
+++ b/canapEPFL/cible.php
@@ -22,6 +22,14 @@
         if (isset($_GET['edit'])) {
           // update data
           updatePostulation($pdo, $candidateData, $_FILES);
+          
+          // get job name
+          $job = $DBController->getPositionName($candidateData->formation);
+          if ($SENDEMAILS) {
+            mailToResp($candidateData->prenomApprenti, $candidateData->nomApprenti, $job);
+            mailToApprenti($candidateData->mailApprenti);
+          }
+          
           include("templates/confirmationText.php");
         } else {
           // write infos in DB
@@ -34,8 +42,10 @@
           // insert files in DB
           insertFiles($pdo, $candidateData->fichiers, $candidateId, $candidateData->rootpath);
 
+          // get job name
+          $job = $DBController->getPositionName($candidateData->formation);
           if ($SENDEMAILS) {
-            mailToResp($candidateData->prenomApprenti, $candidateData->nomApprenti, $candidateData->formation);
+            mailToResp($candidateData->prenomApprenti, $candidateData->nomApprenti, $job);
             mailToApprenti($candidateData->mailApprenti);
           }
           // kill session
diff --git a/canapEPFL/helpers.php b/canapEPFL/helpers.php
index d3ba44c031685bd42adb31b96ca1a226d2280222..22d17d42a451ca688664c81fdbf58b15497f6a0c 100644
--- a/canapEPFL/helpers.php
+++ b/canapEPFL/helpers.php
@@ -1,13 +1,32 @@
 <?php
 #region [Mail Sendings]
 function mailToResp($surname, $name, $job){
-  require_once("templates/mails/mailToResp.php");
-  mail($to, $subject, $message, $headers);
+  global $EMAIL_FORMATION, $EMAIL_FROM, $EMAIL_REPLY_TO;
+
+  $subject = 'Nouvelle Candidature';
+  
+  $message = "Candidat: $surname $name\r\n".
+      "Profession: $job\r\n".
+      "Consulter la candidature sur: https://canap-gest.epfl.ch/";
+  
+  $headers = "From: $EMAIL_FROM\r\n" .
+      "Reply-To: $EMAIL_REPLY_TO\r\n" .
+      "X-Mailer: PHP/" . phpversion();
+    mail($EMAIL_FORMATION, $subject, $message, $headers);
 }
 
 function mailToApprenti($to){
-  require_once("templates/mails/mailToApp.php");
-  mail($to, $subject, $message, $headers);
+  global $EMAIL_FROM, $EMAIL_REPLY_TO;
+
+  $subject = 'Votre candidature pour une place d\'apprentissage';
+
+  $message = file_get_contents('./templates/mails/apprenticeMailTemplate.html');
+  
+  $headers = "From: $EMAIL_FROM\r\n" .
+      "Content-type: text/html; charset=utf8\r\n" .
+      "Reply-To: $EMAIL_REPLY_TO\r\n" .
+      "X-Mailer: PHP/" . phpversion();
+    mail($to, $subject, $message, $headers);
 }
 #endregion
 
diff --git a/canapEPFL/models/DBController.php b/canapEPFL/models/DBController.php
index 40fef326a468f9b3afd372054beed907f64a850b..59fed06806fca82dfcac2f7d892a500f448c904a 100644
--- a/canapEPFL/models/DBController.php
+++ b/canapEPFL/models/DBController.php
@@ -15,4 +15,15 @@ class DBController {
     $query->execute();
     return $query->fetchAll();
   }
+
+  public function getPositionName(int $positionId)
+  {
+    $sqlreq = "SELECT * FROM position JOIN job ON job_id = fk_job JOIN location ON fk_location = location_id WHERE position_id = :position";
+    $query = $this->pdo->prepare($sqlreq);
+    $query->bindParam(':position', $positionId, PDO::PARAM_INT);
+    $query->execute();
+    $job = $query->fetch();
+    return "{$job["job_full_value"]} ({$job["location_site"]})";
+}
+
 }
\ No newline at end of file