diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 7283f9c9db5..8ee8b791303 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1593,7 +1593,9 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			if ($context != 'hide')
 			{
 				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, true, ROWS_5, '90%');
+				$okforextended=true;
+				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
+				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_5, '90%');
 				print $doleditor->Create(1);
 			}
 			else print '&nbsp;';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index eb8e7cf868c..49b4e6af288 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -952,7 +952,7 @@ class FormMail extends Form
 				'__PROJECT_REF__', 
 				'__PROJECT_NAME__',
 				'__CONTACTCIVNAME__',
-				'__PERSONALIZED__',			// Paypal link is added here
+				'__PERSONALIZED__',			// Paypal link will be added here in form mode
 				'__SIGNATURE__', 
 			);
 		}