diff --git a/main/admin/calendar.lib.php b/main/admin/calendar.lib.php
index 667484937a..440ec85ac5 100644
--- a/main/admin/calendar.lib.php
+++ b/main/admin/calendar.lib.php
@@ -1563,9 +1563,9 @@ function show_add_form($id = '')
 
 			$oFCKeditor = new FCKeditor('content') ;
 
-			$oFCKeditor->ToolbarSet = 'Agenda';
-			$oFCKeditor->Height		= '175';
+			$oFCKeditor->ToolbarSet = 'GlobalAgenda';		
 			$oFCKeditor->Width		= '100%';
+			$oFCKeditor->Height		= '175';
 			$oFCKeditor->Value		= $content;
 
 			$return =	$oFCKeditor->CreateHtml();
diff --git a/main/admin/calendar.php b/main/admin/calendar.php
index 0a367a8412..2d7765a3ad 100644
--- a/main/admin/calendar.php
+++ b/main/admin/calendar.php
@@ -256,10 +256,10 @@ if (empty($_GET['origin']) or $_GET['origin']!='learnpath')
 	echo '<td width="20" background="../img/verticalruler.gif">&nbsp;</td>';
 }
 
-
-$fck_attribute['Width'] = '600';
-$fck_attribute['Height'] = '400';
-$fck_attribute['ToolbarSet'] = 'Middle';
+//TODO: check for delete this code
+//$fck_attribute['Width'] = '600';
+//$fck_attribute['Height'] = '400';
+//$fck_attribute['ToolbarSet'] = 'Middle';
 
 
 // THE RIGHT PART
diff --git a/main/inc/lib/fckeditor/myconfig.js b/main/inc/lib/fckeditor/myconfig.js
index 8a67c131ef..f316cff60d 100644
--- a/main/inc/lib/fckeditor/myconfig.js
+++ b/main/inc/lib/fckeditor/myconfig.js
@@ -76,6 +76,18 @@ FCKConfig.ToolbarSets["SystemAnnouncements"] = [
 	['Source']
 ] ;
 
+//Global Agenda
+FCKConfig.ToolbarSets["GlobalAgenda"] = [
+	['FitWindow','-','PasteWord','-','Undo','Redo','RemoveFormat'],
+	['Link','Unlink'],
+	['Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3'],
+	['Table','Rule','SpecialChar','googlemaps'],
+	['FontName','FontSize'],
+	['Bold','Italic','Underline','StrikeThrough'],
+	['OrderedList','UnorderedList','-','TextColor','BGColor'],
+	['Source']
+] ;
+
 ///// users tools /////
 
 FCKConfig.ToolbarSets["Profil"] = [