diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 9a6a9175ca7..ac5529d7d8f 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -507,6 +507,8 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/accountingexport*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
 		# Removed other test files
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 63f5a109466..f6864b53e6a 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -2363,6 +2363,8 @@ else
 			print '<br>';
 			print load_fiche_titre($langs->trans($titreform));
 
+			dol_fiche_head();
+			
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
@@ -2446,7 +2448,7 @@ else
 			}
 			print $formmail->get_form();
 
-			print '<br>';
+			dol_fiche_end();
 		}
 		else
 		{