diff --git a/ChangeLog b/ChangeLog
index 63952957652..57263615ebb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.3 compared to 3.2 *****
 For users:
+- New: If field "signature" is filled into user table, text is added 
+  at end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on, this
+  feautre is disabled.
 - New: Add link "Back to list" on all cards.
 - New: After first install, warning are visible onto mandatory setup not
   configured. Show also total number of activated modules.
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 8347725fd32..597d143f6ea 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -601,12 +601,13 @@ class FormMail
             {
             	if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
 
-                if(! empty($conf->global->MAIL_USE_SIGN) && $this->fromid > 0)
+                if (empty($conf->global->MAIL_DO_NOT_USE_SIGN) && $this->fromid > 0)
                 {
                     $fuser=new User($this->db);
                     $fuser->fetch($this->fromid);
 
-                    if(!empty($fuser->signature)) {
+                    if(! empty($fuser->signature)) 
+                    {
                         $defaultmessage.=dol_htmlentitiesbr_decode($fuser->signature);
                     }
                 }