diff --git a/main/inc/lib/fckeditor/toolbars/default/messages.php b/main/inc/lib/fckeditor/toolbars/default/messages.php
index 43b5b287b6..670baf382b 100755
--- a/main/inc/lib/fckeditor/toolbars/default/messages.php
+++ b/main/inc/lib/fckeditor/toolbars/default/messages.php
@@ -8,16 +8,16 @@
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
 // This is the visible toolbar set when the editor has "normal" size.
-$config['ToolbarSets']['Normal'] = array(
-	array('FitWindow','-','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink','Anchor'),
+$config['ToolbarSets']['Normal'] = array(	
+	array('Link','Unlink'),
 	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
 	array('Table','Smiley'),
+	array('TextColor','BGColor'),
+	array('Source'),
 	'/',
 	array('FontName','FontSize'),
 	array('Bold','Italic','Underline'),
-	array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'),
-	array('Source')
+	array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList')	
 );
 
 // This is the visible toolbar set when the editor is maximized.
diff --git a/main/social/message_for_group_form.inc.php b/main/social/message_for_group_form.inc.php
index c01be8da90..2c157ff12d 100755
--- a/main/social/message_for_group_form.inc.php
+++ b/main/social/message_for_group_form.inc.php
@@ -77,14 +77,14 @@ if (!empty($group_id) && $allowed_action) {
 		   		<br /><?php echo api_xml_http_response_encode(get_lang('Message')); ?> :<br />		   		
 		   		<?php
 				$oFCKeditor = new FCKeditor('content') ;
-				$oFCKeditor->ToolbarSet = 'profile';
+				$oFCKeditor->ToolbarSet = 'messages';
 				$oFCKeditor->Width		= '100%';
-				$oFCKeditor->Height		= '120';
+				$oFCKeditor->Height		= '130';
 				$oFCKeditor->Value		= $message;					
 				$return =	$oFCKeditor->CreateHtml();	
 				echo $return;
 		   		?>		   		
-		   		<br /><br /><?php echo api_xml_http_response_encode(get_lang('AttachmentFiles')); ?> :<br />
+		   		<br /><?php echo api_xml_http_response_encode(get_lang('AttachmentFiles')); ?> :<br />
 				<span id="filepaths"><div id="filepath_1"><input type="file" name="attach_1" size="20" /></div></span>
 				<div id="link-more-attach"><a href="javascript://" onclick="return add_image_form()"><?php echo get_lang('AddOneMoreFile') ?></a>&nbsp;(<?php echo api_xml_http_response_encode(sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize')))) ?>)</div>		   				   				   		
 		   		<br />