diff --git a/main/auth/profile.php b/main/auth/profile.php
index 83f36add59..d5d88cdda7 100644
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -1,4 +1,4 @@
-<?php // $Id: profile.php 18449 2009-02-11 21:16:29Z juliomontoya $
+<?php // $Id: profile.php 18499 2009-02-13 20:57:29Z herodoto $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 ==============================================================================
@@ -129,8 +129,9 @@ if ($user_data !== false)
 }
 
 $user_image = UserManager::get_user_picture_path_by_id(api_get_user_id(),'none');
-$fck_attribute['Height'] = "150";
+
 $fck_attribute['Width'] = "100%";
+$fck_attribute['Height'] = "150";
 $fck_attribute['ToolbarSet'] = "Profil";
 
 /*
diff --git a/main/inc/lib/fckeditor/myconfig.js b/main/inc/lib/fckeditor/myconfig.js
index f316cff60d..b7f887a994 100644
--- a/main/inc/lib/fckeditor/myconfig.js
+++ b/main/inc/lib/fckeditor/myconfig.js
@@ -90,16 +90,27 @@ FCKConfig.ToolbarSets["GlobalAgenda"] = [
 
 ///// users tools /////
 
+//My Profile (Optional fields)
 FCKConfig.ToolbarSets["Profil"] = [
-	['FitWindow','PasteWord','Undo','Redo'],
-	['Link','Image','imgmapPopup','flvPlayer','Flash','EmbedMovies','YouTube','Table','googlemaps'],
-	['Bold','Italic','Underline','OrderedList','UnorderedList','TextColor','-','Source']
+	['FitWindow','-','PasteWord','-','Undo','Redo','-','RemoveFormat'],							   
+	['Link','Unlink','Anchor'],
+	['Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3'],
+	['Table','Rule','Smiley'],
+	['FontName','FontSize'],
+	['Bold','Italic','Underline'],
+	['JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'],
+	['Source']
 ] ;
 
+//Messages
 FCKConfig.ToolbarSets["Messages"] = [
-	['FitWindow','PasteWord','Undo','Redo'],
-	['Link','Image','imgmapPopup','flvPlayer','Flash','EmbedMovies','YouTube','Table','googlemaps'],
-	['Bold','Italic','Underline','OrderedList','UnorderedList','TextColor','-','Source']
+	['FitWindow','PasteText','Undo','Redo'],
+	['Link','Unlink'],
+	['Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3'],
+	['Table','Rule','Smiley','googlemaps'],
+	['Bold','Italic','Underline'],
+	['OrderedList','UnorderedList','-','Blockquote','-','TextColor'],
+	['ShowBlocks']
 ] ;
 
 ///// course tools /////
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index 83af634dd9..e7c3f30426 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -1,4 +1,4 @@
-<?php // $Id: new_message.php 18412 2009-02-10 18:00:32Z iflorespaz $
+<?php // $Id: new_message.php 18499 2009-02-13 20:57:29Z herodoto $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -99,9 +99,10 @@ $(document).ready(function (){
 });
 	</script>';	
 $nameTools = get_lang('ComposeMessage');
+
+$fck_attribute['Width'] = "100%";
 $fck_attribute['Height'] = "150";
-$fck_attribute['Width'] = "95%";
-$fck_attribute['ToolbarSet'] = "Profil";
+$fck_attribute['ToolbarSet'] = "Messages";
 /*
 ==============================================================================
 		FUNCTIONS