diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ccc92ec4d56..811ba377924 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -208,7 +208,19 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td><textarea cols="60" rows="3" name="main_motd" size="20">' . stripslashes($conf->global->MAIN_MOTD) . '</textarea></td></tr>';
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td>';
+	if ($conf->fckeditor->enabled)
+	{
+		// Editeur wysiwyg
+		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		$doleditor=new DolEditor('main_motd',$conf->global->MAIN_MOTD,158,'dolibarr_notes','In',true);
+		$doleditor->Create();
+	}
+	else
+	{
+		print '<textarea name="main_motd" cols="90" rows="'.ROWS_5.'">'.$conf->global->MAIN_MOTD.'</textarea>';
+	}
+	print '</td></tr>';
     print '</table>';
 
     print '<br><center>';
@@ -315,11 +327,14 @@ else
     print '</table>';
     print '<br>';
 
+	// Message of the day
     $var=true;
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td>' . stripslashes(nl2br($conf->global->MAIN_MOTD)) . '</td></tr>';
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td>';
+    print nl2br($conf->global->MAIN_MOTD);
+    print '</td></tr>';
     print '</table>';
 
     print '<div class="tabsAction">';
diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php
index 70f4e7c414a..852b1bf18cc 100644
--- a/htdocs/includes/boxes/modules_boxes.php
+++ b/htdocs/includes/boxes/modules_boxes.php
@@ -65,8 +65,10 @@ class ModeleBoxes
         $nbcol=sizeof($contents[0])+1;
         $nblines=sizeof($contents);
         
-        print "\n<!-- Box start -->\n";
-        print '<table width="100%" class="noborder">';
+        print "\n\n<!-- Box start -->\n";
+        print '<table width="100%" class="noborder"';
+        if (isset($this->boxid)) print ' id="boxobject_'.$this->boxid.'"';
+        print '>';
     
         // Affiche titre de la boite
         print '<tr class="box_titre"><td';
@@ -157,7 +159,7 @@ class ModeleBoxes
     
         print "</table>";
         
-        print "\n<!-- Box end -->\n";
+        print "\n<!-- Box end -->\n\n";
         
     }
     
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index 20d28c14e7a..8082e7ddfab 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -608,7 +608,6 @@ list-style-type:none;
 margin:0px;
 padding:0px;
 spacing:0px;
-cursor:move;
 }
 
 .notopnoleft {