diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 0391e31de5..c75ef62771 100644
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -25,7 +25,7 @@
 *	Exercise class: This class allows to instantiate an object of type Exercise
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: exercise.class.php 20125 2009-04-27 16:20:02Z juliomontoya $
+* 	@version $Id: exercise.class.php 20136 2009-04-27 20:52:51Z juliomontoya $
 */
 
 
@@ -870,7 +870,7 @@ class Exercise
 		$form -> addElement('html','<div class="row">
 		<div class="label"></div>
 		<div class="formw" style="height:50px">
-			<a href="javascript://" onclick=" return show_media()"> <span id="media_icon"> <img src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'</span></a>
+			<a href="javascript://" onclick=" return show_media()"> <span id="media_icon"> <img src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('ExerciseDescription').'</span></a>
 		</div>
 		</div>');
 	
diff --git a/main/exercice/exercise_admin.php b/main/exercice/exercise_admin.php
index 8c6683a9ff..4f8be1de06 100644
--- a/main/exercice/exercise_admin.php
+++ b/main/exercice/exercise_admin.php
@@ -60,10 +60,10 @@ $htmlHeadXtra[] = '<script>
 		function show_media() {
 			if(document.getElementById(\'media\').style.display == \'none\') {
 				document.getElementById(\'media\').style.display = \'block\';
-				document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img src="../img/looknfeelna.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'\';
+				document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img src="../img/looknfeelna.png" alt="" />&nbsp;'.get_lang('ExerciseDescription').'\';
 			} else {			
 				document.getElementById(\'media\').style.display = \'none\';
-				document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'\';
+				document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('ExerciseDescription').'\';
 				
 			}	
 		}			
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index c21bb0c0fe..b1eded07f2 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -1,4 +1,4 @@
-<?php // $Id: question.class.php 20029 2009-04-23 19:57:27Z aportugal $
+<?php // $Id: question.class.php 20136 2009-04-27 20:52:51Z juliomontoya $
  
 /*
 ==============================================================================
@@ -28,7 +28,7 @@
 *	File containing the Question class.
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: question.class.php 20029 2009-04-23 19:57:27Z aportugal $
+* 	@version $Id: question.class.php 20136 2009-04-27 20:52:51Z juliomontoya $
 */
 
 
@@ -968,6 +968,21 @@ abstract class Question
 					div.row div.label{ width: 10%; }
 					div.row div.formw{ width: 89%; }
 				</style>';
+				
+		echo '	<script>
+				function show_media() {
+			if(document.getElementById(\'media\').style.display == \'none\') {
+				document.getElementById(\'media\').style.display = \'block\';
+				document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img src="../img/looknfeelna.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'\';
+			} else {			
+				document.getElementById(\'media\').style.display = \'none\';
+				document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'\';
+				
+			}	
+		}	
+			</script>';		
+			
+
 		$renderer = $form->defaultRenderer();
 		$form->addElement('html','<div class="form">');
 		// question name
@@ -992,6 +1007,8 @@ abstract class Question
 		// question type
 		$answerType= intval($_REQUEST['answerType']);
 		$form->addElement('hidden','answerType',$_REQUEST['answerType']);
+		
+		
 		// html editor
 		global $fck_attribute;
 		$fck_attribute = array();
@@ -1001,12 +1018,22 @@ abstract class Question
 		
 		if(is_array($fck_config)){
 			$fck_attribute = array_merge($fck_attribute,$fck_config);
-		}
-		
+		}		
 		
 		if(!api_is_allowed_to_edit()) $fck_attribute['Config']['UserStatus'] = 'student';
 
-		$form->add_html_editor('questionDescription', get_lang('QuestionDescription'), false);
+		$form -> addElement('html','<div class="row">
+		<div class="label"></div>
+		<div class="formw" style="height:50px">
+			<a href="javascript://" onclick=" return show_media()"> <span id="media_icon"> <img src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'</span></a>
+		</div>
+		</div>');
+		
+		$form -> addElement ('html','<div id="media" style="display:none;">');
+				
+		$form->add_html_editor('questionDescription','', false);
+		$form -> addElement ('html','</div>');
+		
 		$renderer->setElementTemplate('<div class="row"><div class="label">{label}</div><div class="formw">{element}</div></div>','questionDescription');
 
 		// hidden values