diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index fb135dcfb8e..231a3a9a3dc 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -127,7 +127,7 @@ print '</td></tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("ActivateCheckRead").'</td><td>';
-if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE==1)
+if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
 {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&value=off">';
 	print img_picto($langs->trans("Enabled"),'switch_on');
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index b2e924749a4..4262616fef8 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -41,7 +41,7 @@ $substitutionarrayfortest=array(
 '__LASTNAME__' => 'TESTLastname',
 '__FIRSTNAME__' => 'TESTFirstname',
 '__SIGNATURE__' => 'TESTSignature',
-'__PERSONALIZED__' => 'TESTPersonalized'
+//'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
 
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 4eeeb428128..c1b8628dca8 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -57,22 +57,22 @@ $object->substitutionarray=array(
     '__EMAIL__' => 'EMail',
     '__LASTNAME__' => 'Lastname',
     '__FIRSTNAME__' => 'Firstname',
-    '__MAILTOEMAIL__' => 'MailtoEmail',
+    '__MAILTOEMAIL__' => 'TagMailtoEmail',
     '__OTHER1__' => 'Other1',
     '__OTHER2__' => 'Other2',
     '__OTHER3__' => 'Other3',
     '__OTHER4__' => 'Other4',
     '__OTHER5__' => 'Other5',
-    '__SIGNATURE__' => 'Signature',
-    '__PERSONALIZED__' => 'Personalized'
+    '__SIGNATURE__' => 'TagSignature',
+    //'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet
 );
-if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
+if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
 {
     $object->substitutionarray=array_merge(
         $object->substitutionarray,
         array(
-            '__CHECK_READ__' => 'CheckMail',
-            '__UNSUBSCRIBE__' => 'Unsubscribe'
+            '__CHECK_READ__' => 'TagCheckMail',
+            '__UNSUBSCRIBE__' => 'TagUnsubscribe'
         )
     );
 }
@@ -89,9 +89,9 @@ $object->substitutionarrayfortest=array(
     '__OTHER4__' => 'TESTOther4',
     '__OTHER5__' => 'TESTOther5',
     '__SIGNATURE__' => 'TESTSignature',
-    '__PERSONALIZED__' => 'TESTPersonalized'
+    //'__PERSONALIZED__' => 'TESTPersonalized'	// Not used yet
 );
-if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
+if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
 {
     $object->substitutionarrayfortest=array_merge(
         $object->substitutionarrayfortest,
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 5f8f32ec9c4..dca09d03cd3 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -77,7 +77,7 @@ MailingStatusRead=Read
 CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
-ActivateCheckRead=Activate Read receipt and unsubcribe tag
+ActivateCheckRead=Allow to use the Read receipt tracker and the unsubcribe link
 ActivateCheckReadKey=Key use to encrypt URL use for Read Receipt and unsubcribe function
 
 # Libelle des modules de liste de destinataires mailing
@@ -115,6 +115,10 @@ NbOfEMailingsReceived=Mass emailings received
 IdRecord=ID record
 DeliveryReceipt=Delivery Receipt
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+TagCheckMail=Tracker mail opened
+TagUnsubscribe=Unsubscribe link
+TagSignature=Signature sending user
+TagMailtoEmail=Recipient EMail
 
 # Module Notifications
 Notifications=Notifications
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 93afec16081..ee1c26af6d7 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -77,7 +77,7 @@ MailingStatusRead=Lu
 CheckRead=Accusé de lecture
 YourMailUnsubcribeOK=L'adresse e-mail <b>%s</b> est bien désincrite de la liste.
 MailtoEMail=Ecrire a e-mail (lien)
-ActivateCheckRead=Activer les tags d'accusé de lecture et de désincription
+ActivateCheckRead=Permettre l'utilisation du tracker d'accusé de lecture et du lien de désincription
 ActivateCheckReadKey=Clef de sécurité utilisée pour l'encryption des URL utilisées dans les fonctions d'accusé de lecture et de désincription
 
 # Libelle des modules de liste de destinataires mailing
@@ -114,6 +114,10 @@ NbOfEMailingsReceived=EMailings de masse reçus
 IdRecord=ID enregistrement
 DeliveryReceipt=Accusé de réception
 YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le caractère de séparation <b>virgule</b> pour spécifier plusieurs destinataires.
+TagCheckMail=Tracker ouverture mail
+TagUnsubscribe=Lien désinscription mailing masse
+TagSignature=Signature utilisateur émetteur
+TagMailtoEmail=EMail destinataire
 
 # Module Notifications
 Notifications=Notifications