diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 6b8126bd977..dadf7b476ee 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -676,6 +676,8 @@ else
 	    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend"));
 
+		dol_fiche_head('');
+
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
@@ -714,7 +716,7 @@ else
 
 		print $formmail->get_form('addfile','removefile');
 
-		print '<br>';
+		dol_fiche_end();
 	}
 }
 
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index c33b798c3a9..f2e861ea932 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -433,7 +433,7 @@ class FormMail extends Form
         		}
         		else
         		{
-        			$out.= "<tr><td>".$langs->trans("MailFrom")."</td><td>";
+        			$out.= '<tr><td class="fieldrequired">'.$langs->trans("MailFrom")."</td><td>";
         			$out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" size="32" value="'.$this->fromname.'" />';
         			$out.= '&nbsp; &nbsp; ';
         			$out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" size="32" value="'.$this->frommail.'" />&gt;';
@@ -441,42 +441,10 @@ class FormMail extends Form
         		}
         	}
 
-        	// Replyto
-        	if (! empty($this->withreplyto))
-        	{
-        		if ($this->withreplytoreadonly)
-        		{
-        			$out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
-        			$out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
-        			$out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
-        			$out.= "</td></tr>\n";
-        		}
-        	}
-
-        	// Errorsto
-        	if (! empty($this->witherrorsto))
-        	{
-        		//if (! $this->errorstomail) $this->errorstomail=$this->frommail;
-        		$errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
-        		if ($this->witherrorstoreadonly)
-        		{
-        			$out.= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-        			$out.= $errorstomail;
-        			$out.= "</td></tr>\n";
-        		}
-        		else
-        		{
-        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-        			$out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-        			$out.= "</td></tr>\n";
-        		}
-        	}
-
         	// To
         	if (! empty($this->withto) || is_array($this->withto))
         	{
-        		$out.= '<tr><td width="180">';
+        		$out.= '<tr><td class="fieldrequired" width="180">';
         		if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
         		else $out.= $langs->trans("MailTo");
         		$out.= '</td><td>';
@@ -604,6 +572,38 @@ class FormMail extends Form
         		$out.= "</td></tr>\n";
         	}
 
+        	// Replyto
+        	if (! empty($this->withreplyto))
+        	{
+        		if ($this->withreplytoreadonly)
+        		{
+        			$out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
+        			$out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
+        			$out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
+        			$out.= "</td></tr>\n";
+        		}
+        	}
+
+        	// Errorsto
+        	if (! empty($this->witherrorsto))
+        	{
+        		//if (! $this->errorstomail) $this->errorstomail=$this->frommail;
+        		$errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
+        		if ($this->witherrorstoreadonly)
+        		{
+        			$out.= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+        			$out.= $errorstomail;
+        			$out.= "</td></tr>\n";
+        		}
+        		else
+        		{
+        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+        			$out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+        			$out.= "</td></tr>\n";
+        		}
+        	}
+
         	// Ask delivery receipt
         	if (! empty($this->withdeliveryreceipt))
         	{
@@ -636,7 +636,7 @@ class FormMail extends Form
         		$defaulttopic=make_substitutions($defaulttopic,$this->substit);
 
         		$out.= '<tr>';
-        		$out.= '<td width="180">'.$langs->trans("MailTopic").'</td>';
+        		$out.= '<td class="fieldrequired" width="180">'.$langs->trans("MailTopic").'</td>';
         		$out.= '<td>';
         		if ($this->withtopicreadonly)
         		{
diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
index f83a808a0b9..a8c280193ea 100644
--- a/htdocs/modulebuilder/template/scripts/myobject.php
+++ b/htdocs/modulebuilder/template/scripts/myobject.php
@@ -43,7 +43,12 @@ $error=0;
 define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
 
 // Include and load Dolibarr environment variables
-require_once($path."../../htdocs/master.inc.php");
+$res=0;
+if (! $res && file_exists($path."master.inc.php")) $res=@include($path."master.inc.php");
+if (! $res && file_exists($path."../master.inc.php")) $res=@include($path."../master.inc.php");
+if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php");
+if (! $res && file_exists($path."../../../master.inc.php")) $res=@include($path."../../../master.inc.php");
+if (! $res) die("Include of master fails");
 // After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
 // $user is created but empty.