diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index ea75f7eeab6..afc00b60225 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -342,11 +342,11 @@ if (empty($reshook))
     			$filename=array(); $filedir=array(); $mimetype=array();
     
     			// SUBJECT
-    			$subject = $langs->trans("ExpenseReportWaitingForApproval");
+    			$subject = $langs->transnoentities("ExpenseReportWaitingForApproval");
     
     			// CONTENT
     			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
-    			$message = $langs->trans("ExpenseReportWaitingForApprovalMessage", $expediteur->getFullName($langs), get_date_range($object->date_debut,$object->date_fin,'',$langs), $link);
+    			$message = $langs->transnoentities("ExpenseReportWaitingForApprovalMessage", $expediteur->getFullName($langs), get_date_range($object->date_debut,$object->date_fin,'',$langs), $link);
     
     			// Rebuild pdf
     			/*
@@ -436,74 +436,83 @@ if (empty($reshook))
     
     	if ($result > 0)
     	{
-    		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))  // TODO Translate this so we can remove condition
-    		{
-    			// Send mail
+    		// Send mail
+
+   			// TO
+   			$destinataire = new User($db);
+   			$destinataire->fetch($object->fk_user_validator);
+   			$emailTo = $destinataire->email;
     
-    			// TO
-    			$destinataire = new User($db);
-    			$destinataire->fetch($object->fk_user_validator);
-    			$emailTo = $destinataire->email;
+   			if ($emailTo)
+   			{
+   				// FROM
+   				$expediteur = new User($db);
+   				$expediteur->fetch($object->fk_user_author);
+   				$emailFrom = $expediteur->email;
+
+    			// SUBJECT
+    			$subject = $langs->transnoentities("ExpenseReportWaitingForReApproval");
     
-    			if ($emailTo)
+    			// CONTENT
+    			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				$dateRefusEx = explode(" ",$object->date_refuse);
+    			$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", $dateRefusEx[0], $object->detail_refuse, $expediteur->getFullName($langs), $link);
+
+   				// Rebuild pdf
+				/*
+				$object->setDocModel($user,"");
+				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+
+   				if($resultPDF)
+   				{
+   					// ATTACHMENT
+   					$filename=array(); $filedir=array(); $mimetype=array();
+   					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+   					array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref_number).".pdf");
+   					array_push($mimetype,"application/pdf");
+				}
+				*/
+
+    			// PREPARE SEND
+    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    			if ($mailfile)
     			{
-    				// FROM
-    				$expediteur = new User($db);
-    				$expediteur->fetch($object->fk_user_author);
-    				$emailFrom = $expediteur->email;
-    
-    				// SUBJECT
-    				$subject = "' ERP - Note de frais à re-approuver";
-    
-    				// CONTENT
-    				$dateRefusEx = explode(" ",$object->date_refuse);
-    
-    				$message = "Bonjour {$destinataire->firstname},\n\n";
-    				$message.= "Le {$dateRefusEx[0]} à {$dateRefusEx[1]} vous avez refusé d'approuver la note de frais \"{$object->ref}\". Vous aviez émis le motif suivant : {$object->detail_refuse}\n\n";
-    				$message.= "L'auteur vient de modifier la note de frais, veuillez trouver la nouvelle version en pièce jointe.\n";
-    				$message.= "- Déclarant : {$expediteur->firstname} {$expediteur->lastname}\n";
-    				$message.= "- Période : du {$object->date_debut} au {$object->date_fin}\n";
-    				$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    				$message.= "Bien cordialement,\n' SI";
-    
-    				// Génération du pdf avant attachement
-    				$object->setDocModel($user,"");
-    				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    				if($resultPDF)
+    				// SEND
+    				$result=$mailfile->sendfile();
+    				if ($result)
     				{
-    					// ATTACHMENT
-    					$filename=array(); $filedir=array(); $mimetype=array();
-    					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    					array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref_number).".pdf");
-    					array_push($mimetype,"application/pdf");
-    
-    					// PREPARE SEND
-    					$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
-    
-    					if (! $mailfile->error)
+    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    					setEventMessages($mesg, null, 'mesgs');
+    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+    					exit;
+    				}
+    				else
+    				{
+    					$langs->load("other");
+    					if ($mailfile->error)
     					{
-    						// SEND
-    						$result=$mailfile->sendfile();
-    						if ($result)
-    						{
-    							Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    							exit;
-    						}
-    						else
-    						{
-    							$mesg=$mailfile->error;
-    							setEventMessages($mesg, null, 'errors');
-    						}
-    						// END - Send mail
+    						$mesg='';
+    						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    						$mesg.='<br>'.$mailfile->error;
+    						setEventMessages($mesg, null, 'errors');
     					}
     					else
     					{
-    						dol_print_error($db,$resultPDF);
-    						exit;
+    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     					}
     				}
     			}
+    			else
+    			{
+    				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    				$action='';
+    			}
+    		}
+    		else
+    		{
+    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			$action='';
     		}
     	}
     	else
@@ -542,80 +551,89 @@ if (empty($reshook))
     
     	if ($result > 0)
     	{
-    		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))  // TODO Translate this so we can remove condition
-    		{
-    			// Send mail
+    		// Send mail
+
+  			// TO
+   			$destinataire = new User($db);
+   			$destinataire->fetch($object->fk_user_author);
+   			$emailTo = $destinataire->email;
+
+   			// CC
+   			$emailCC = $conf->global->NDF_CC_EMAILS;
+
+			// FROM
+   			$expediteur = new User($db);
+   			$expediteur->fetch($object->fk_user_valid);
+   			$emailFrom = $expediteur->email;
+
+			// SUBJECT
+   			$subject = $langs->transnoentities("ExpenseReportApproved");
+
+   			// CONTENT
+   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+   			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+
+   			// Rebuilt pdf
+			/*
+    		$object->setDocModel($user,"");
+    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
     
-    			// TO
-    			$destinataire = new User($db);
-    			$destinataire->fetch($object->fk_user_author);
-    			$emailTo = $destinataire->email;
-    
-    			// CC
-    			$emailCC = $conf->global->NDF_CC_EMAILS;
-    
-    			// FROM
-    			$expediteur = new User($db);
-    			$expediteur->fetch($object->fk_user_valid);
-    			$emailFrom = $expediteur->email;
-    
-    			// SUBJECT
-    			$subject = "' ERP - Note de frais validée";
-    
-    			// CONTENT
-    			$message = "Bonjour {$destinataire->firstname},\n\n";
-    			$message.= "Votre note de frais \"{$object->ref}\" vient d'être approuvé!\n";
-    			$message.= "- Approbateur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    			$message.= "Bien cordialement,\n' SI";
-    
-    			// Génération du pdf avant attachement
-    			$object->setDocModel($user,"");
-    			$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    			if($resultPDF):
-    				// ATTACHMENT
-    				$filename=array(); $filedir=array(); $mimetype=array();
-    				array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    				array_push($filedir, $conf->expensereport->dir_output.
-    					"/".
-    					dol_sanitizeFileName($object->ref) .
-    					"/".
-    					dol_sanitizeFileName($object->ref).
-    					".pdf"
-    					);
-    				array_push($mimetype,"application/pdf");
-    
-    				// PREPARE SEND
-    				$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename,$emailCC);
-    
-    				if(!$mailfile->error):
-    
-    					// SEND
-    					$result=$mailfile->sendfile();
-    					if ($result):
-    						setEventMessages($langs->trans("MailSuccessfulySent",$emailFrom,$emailTo), null, 'mesgs');
-    						Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    						exit;
-    					else:
-    						setEventMessages($langs->trans("ErrorFailedToSendMail",$emailFrom,$emailTo), null, 'errors');
-    					endif;
-    
-    				else:
-    					setEventMessages($langs->trans("ErrorFailedToSendMail",$emailFrom,$emailTo), null, 'errors');
-    				endif;
-    				// END - Send mail
-    			else : // if ($resultPDF)
-    				dol_print_error($db,$resultPDF);
-    				exit;
-    			endif;
-    		}
-    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+    		if($resultPDF
+			{
+    			// ATTACHMENT
+    			$filename=array(); $filedir=array(); $mimetype=array();
+    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+    			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+    			array_push($mimetype,"application/pdf");
+			}
+			*/
+
+        	// PREPARE SEND
+    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+
+   			if ($mailfile)
+   			{
+   				// SEND
+   				$result=$mailfile->sendfile();
+   				if ($result)
+   				{
+   					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+   					setEventMessages($mesg, null, 'mesgs');
+   					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+   					exit;
+   				}
+   				else
+   				{
+   					$langs->load("other");
+   					if ($mailfile->error)
+   					{
+   						$mesg='';
+   						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+   						$mesg.='<br>'.$mailfile->error;
+   						setEventMessages($mesg, null, 'errors');
+   					}
+   					else
+   					{
+   						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+   					}
+   				}
+   			}
+   			else
+   			{
+   				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+   				$action='';
+   			}
+   		}
+   		else
+   		{
+   			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+   			$action='';
+   		}
+   	}
+   	else
+   	{
+   		setEventMessages($object->error, $object->errors, 'errors');
+   	}
     
     if ($action == "confirm_refuse" && GETPOST('confirm')=="yes" && $id > 0 && $user->rights->expensereport->approve)
     {
@@ -646,57 +664,86 @@ if (empty($reshook))
     
     	if ($result > 0)
     	{
-    		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))  // TODO Translate this so we can remove condition
+    		// Send mail
+    
+    		// TO
+    		$destinataire = new User($db);
+    		$destinataire->fetch($object->fk_user_author);
+    		$emailTo = $destinataire->email;
+    
+    		// FROM
+    		$expediteur = new User($db);
+    		$expediteur->fetch($object->fk_user_refuse);
+    		$emailFrom = $expediteur->email;
+    
+			// SUBJECT
+   			$subject = $langs->transnoentities("ExpenseReportRefused");
+
+   			// CONTENT
+   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_refuse'], $link);
+
+   			// Rebuilt pdf
+			/*
+    		$object->setDocModel($user,"");
+    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+    
+    		if($resultPDF
+			{
+    			// ATTACHMENT
+    			$filename=array(); $filedir=array(); $mimetype=array();
+    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+    			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+    			array_push($mimetype,"application/pdf");
+			}
+			*/
+    
+    		// PREPARE SEND
+    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    		if ($mailfile)
     		{
-    			// Send mail
-    
-    			// TO
-    			$destinataire = new User($db);
-    			$destinataire->fetch($object->fk_user_author);
-    			$emailTo = $destinataire->email;
-    
-    			// FROM
-    			$expediteur = new User($db);
-    			$expediteur->fetch($object->fk_user_refuse);
-    			$emailFrom = $expediteur->email;
-    
-    			// SUBJECT
-    			$subject = "' ERP - Note de frais refusée";
-    
-    			// CONTENT
-    			$message = "Bonjour {$destinataire->firstname},\n\n";
-    			$message.= "Votre note de frais \"{$object->ref}\" vient d'être refusée.\n";
-    			$message.= "- Refuseur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    			$message.= "- Motif de refus : {$_POST['detail_refuse']}\n";
-    			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    			$message.= "Bien cordialement,\n' SI";
-    
-    			// PREPARE SEND
-    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message);
-    
-    			if(!$mailfile->error)
+    			// SEND
+    			$result=$mailfile->sendfile();
+    			if ($result)
     			{
-    				// SEND
-    				$result=$mailfile->sendfile();
-    				if ($result)
+    				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    				setEventMessages($mesg, null, 'mesgs');
+    				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+    				exit;
+    			}
+    			else
+    			{
+    				$langs->load("other");
+    				if ($mailfile->error)
     				{
-    					setEventMessages($langs->trans("MailSuccessfulySent",$emailFrom,$emailTo), null, 'mesgs');
-    					Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    					exit;
+    					$mesg='';
+    					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    					$mesg.='<br>'.$mailfile->error;
+    					setEventMessages($mesg, null, 'errors');
     				}
     				else
     				{
-    					setEventMessages($langs->trans("ErrorFailedToSendMail",$emailFrom,$emailTo), null, 'errors');
+    					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     				}
-    				// END - Send mail
     			}
     		}
+    		else
+    		{
+    			setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    			$action='';
+    		}
     	}
     	else
     	{
-    		setEventMessages($object->error, $object->errors, 'errors');
+    		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    		$action='';
     	}
     }
+    else
+    {
+    	setEventMessages($object->error, $object->errors, 'errors');
+    }
     
     //var_dump($user->id == $object->fk_user_validator);exit;
     if ($action == "confirm_cancel" && GETPOST('confirm')=="yes" && GETPOST('detail_cancel') && $id > 0 && $user->rights->expensereport->creer)
@@ -730,64 +777,85 @@ if (empty($reshook))
     
     		if ($result > 0)
     		{
-    			if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))     // TODO Translate this so we can remove condition
+    			// Send mail
+    
+    			// TO
+    			$destinataire = new User($db);
+    			$destinataire->fetch($object->fk_user_author);
+    			$emailTo = $destinataire->email;
+    
+    			// FROM
+    			$expediteur = new User($db);
+    			$expediteur->fetch($object->fk_user_cancel);
+    			$emailFrom = $expediteur->email;
+    
+				// SUBJECT
+				$subject = $langs->transnoentities("ExpenseReportCanceled");
+
+				// CONTENT
+				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $_POST['detail_cancel'], $link);
+
+				// Rebuilt pdf
+				/*
+				$object->setDocModel($user,"");
+				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+		
+				if($resultPDF
+				{
+					// ATTACHMENT
+					$filename=array(); $filedir=array(); $mimetype=array();
+					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+					array_push($mimetype,"application/pdf");
+				}
+				*/
+
+    			// PREPARE SEND
+    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    			if ($mailfile)
     			{
-    				// Send mail
-    
-    				// TO
-    				$destinataire = new User($db);
-    				$destinataire->fetch($object->fk_user_author);
-    				$emailTo = $destinataire->email;
-    
-    				// FROM
-    				$expediteur = new User($db);
-    				$expediteur->fetch($object->fk_user_cancel);
-    				$emailFrom = $expediteur->email;
-    
-    				// SUBJECT
-    				$subject = "' ERP - Note de frais annulée";
-    
-    				// CONTENT
-    				$message = "Bonjour {$destinataire->firstname},\n\n";
-    				$message.= "Votre note de frais \"{$object->ref}\" vient d'être annulée.\n";
-    				$message.= "- Annuleur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    				$message.= "- Motif d'annulation : {$_POST['detail_cancel']}\n";
-    				$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    				$message.= "Bien cordialement,\n' SI";
-    
-    				// PREPARE SEND
-    				$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message);
-    
-    				if(!$mailfile->error)
+    				// SEND
+    				$result=$mailfile->sendfile();
+    				if ($result)
     				{
-    					// SEND
-    					$result=$mailfile->sendfile();
-    					if ($result)
-    					{
-    						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    						exit;
-    					}
-    					else
-    					{
-    						$mesg="Impossible d'envoyer l'email.";
-    						setEventMessages($mesg, null, 'errors');
-    					}
-    					// END - Send mail
+    					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    					setEventMessages($mesg, null, 'mesgs');
+    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+    					exit;
     				}
     				else
     				{
-    					setEventMessages($mail->error, $mail->errors, 'errors');
+    					$langs->load("other");
+    					if ($mailfile->error)
+    					{
+    						$mesg='';
+    						$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    						$mesg.='<br>'.$mailfile->error;
+    						setEventMessages($mesg, null, 'errors');
+    					}
+    					else
+    					{
+    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+    					}
     				}
     			}
+    			else
+    			{
+    				setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    				$action='';
+    			}
     		}
     		else
     		{
-    			setEventMessages($object->error, $object->errors, 'errors');
+    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    			$action='';
     		}
     	}
     	else
     	{
-    	    setEventMessages($langs->transnoentitiesnoconv("OnlyOwnerCanCancel"), '', 'errors');    // Should not happened
+    		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
     
@@ -864,68 +932,83 @@ if (empty($reshook))
     
     	if ($result > 0)
     	{
-    		if (! empty($conf->global->DEPLACEMENT_TO_CLEAN)) // TODO Translate this so we can remove condition
+    		// Send mail
+    
+    		// TO
+    		$destinataire = new User($db);
+    		$destinataire->fetch($object->fk_user_author);
+    		$emailTo = $destinataire->email;
+    
+    		// FROM
+    		$expediteur = new User($db);
+    		$expediteur->fetch($user->id);
+    		$emailFrom = $expediteur->email;
+    
+			// SUBJECT
+			$subject = $langs->transnoentities("ExpenseReportPaid");
+
+			// CONTENT
+			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+    
+    		// CONTENT
+    		$message = "Bonjour {$destinataire->firstname},\n\n";
+    		$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
+    		$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
+    		$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
+    		$message.= "Bien cordialement,\n' SI";
+    
+    		// Generate pdf before attachment
+    		$object->setDocModel($user,"");
+    		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+    
+    		// PREPARE SEND
+    		$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message,$filedir,$mimetype,$filename);
+    
+    		if ($mailfile)
     		{
-    			// Send mail
-    
-    			// TO
-    			$destinataire = new User($db);
-    			$destinataire->fetch($object->fk_user_author);
-    			$emailTo = $destinataire->email;
-    
-    			// FROM
-    			$expediteur = new User($db);
-    			$expediteur->fetch($user->id);
-    			$emailFrom = $expediteur->email;
-    
-    			// SUBJECT
-    			$subject = "'ERP - Note de frais payée";
-    
-    			// CONTENT
-    			$message = "Bonjour {$destinataire->firstname},\n\n";
-    			$message.= "Votre note de frais \"{$object->ref}\" vient d'être payée.\n";
-    			$message.= "- Payeur : {$expediteur->firstname} {$expediteur->lastname}\n";
-    			$message.= "- Lien : {$dolibarr_main_url_root}/expensereport/card.php?id={$object->id}\n\n";
-    			$message.= "Bien cordialement,\n' SI";
-    
-    			// Generate pdf before attachment
-    			$object->setDocModel($user,"");
-    			$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
-    
-    			// PREPARE SEND
-    			$mailfile = new CMailFile($subject,$emailTo,$emailFrom,$message);
-    
-    			if(!$mailfile->error):
-    
     			// SEND
-    			$result=$mailfile->sendfile();
-    			if ($result):
-    
-    			// Retour
-    			if($result):
-    				Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				$result=$mailfile->sendfile();
+    			if ($result)
+    			{
+    				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($emailFrom,2),$mailfile->getValidAddress($emailTo,2));
+    				setEventMessages($mesg, null, 'mesgs');
+    				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     				exit;
-    			else:
-    				dol_print_error($db);
-    			endif;
-    
-    			else:
-    			dol_print_error($db,$acct->error);
-    			endif;
-    
-    			else:
-                    $mesg="Impossible d'envoyer l'email.";
-                    setEventMessages($mesg, null, 'errors');
-    			endif;
-    			// END - Send mail
+    			}
+    			else
+    			{
+					$langs->load("other");
+    				if ($mailfile->error)
+    				{
+    					$mesg='';
+    					$mesg.=$langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+    					$mesg.='<br>'.$mailfile->error;
+    					setEventMessages($mesg, null, 'errors');
+    				}
+    				else
+    				{
+    					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+    				}
+    			}
+    		}
+    		else
+    		{
+    			setEventMessages($mailfile->error,$mailfile->errors,'errors');
+    			$action='';
     		}
     	}
     	else
     	{
-    		setEventMessages($object->error, $object->errors, 'errors');
+    		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+    		$action='';
     	}
     }
-    
+    else
+    {
+    	setEventMessages($object->error, $object->errors, 'errors');
+    }
+
     if ($action == "addline" && $user->rights->expensereport->creer)
     {
     	$error = 0;
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 9cb992f6af3..ac650ab98c7 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -21,7 +21,17 @@ ListToApprove=Waiting for approval
 ExpensesArea=Expense reports area
 ClassifyRefunded=Classify 'Refunded'
 ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
 TripId=Id expense report
 AnyOtherInThisListCanValidate=Person to inform for validation. 
 TripSociete=Information company