diff --git a/main/admin/group_add.php b/main/admin/group_add.php
index 5353e80ca4..9bac236e8f 100755
--- a/main/admin/group_add.php
+++ b/main/admin/group_add.php
@@ -26,7 +26,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
 // User permissions
 api_protect_admin_script();
 
-$htmlHeadXtra[] = '<script type="text/javascript" src="/main/inc/lib/javascript/jquery.js"></script>';
 $htmlHeadXtra[] = '<script type="text/javascript">
 textarea = "";
 num_characters_permited = 255;
diff --git a/main/admin/group_edit.php b/main/admin/group_edit.php
index 855951922e..5d6d490f20 100755
--- a/main/admin/group_edit.php
+++ b/main/admin/group_edit.php
@@ -28,7 +28,6 @@ $interbreadcrumb[] = array('url' => 'group_list.php','name' => get_lang('GroupLi
 
 $table_group = Database::get_main_table(TABLE_MAIN_GROUP);
 
-$htmlHeadXtra[] = '<script type="text/javascript" src="/main/inc/lib/javascript/jquery.js"></script>';
 $htmlHeadXtra[] = '<script type="text/javascript">
 textarea = "";
 num_characters_permited = 255;
diff --git a/main/admin/languages.php b/main/admin/languages.php
index bc6f838e0f..3fd2ceba76 100755
--- a/main/admin/languages.php
+++ b/main/admin/languages.php
@@ -49,7 +49,6 @@ if (isset($_POST['sent_http_request'])) {
 	}
 	exit;
 }
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] ='<script type="text/javascript">
  $(document).ready(function() {
 
diff --git a/main/admin/sub_language.php b/main/admin/sub_language.php
index 2a6f8d943f..fae8beadf1 100755
--- a/main/admin/sub_language.php
+++ b/main/admin/sub_language.php
@@ -11,7 +11,6 @@ require_once api_get_path(LIBRARY_PATH).'array.lib.php';
 $this_section=SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
-$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] ='<script type="text/javascript">
  $(document).ready(function() {
 
diff --git a/main/admin/user_fields_add.php b/main/admin/user_fields_add.php
index bae1fa517e..db3471e167 100755
--- a/main/admin/user_fields_add.php
+++ b/main/admin/user_fields_add.php
@@ -18,7 +18,6 @@ $this_section=SECTION_PLATFORM_ADMIN;
 
 // user permissions
 api_protect_admin_script();
-$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function change_image_user_field (image_value) {
 	
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index e0bd1d2164..100d625ec2 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -22,7 +22,6 @@ if (isset($_configuration['deny_delete_users']) &&  $_configuration['deny_delete
 	$delete_user_available = false;
 }
 
-$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>';
 $htmlHeadXtra[] = '<script type="text/javascript">
 function load_course_list (div_course,my_user_id) {
 	 $.ajax({
diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php
index 8eda5550d7..508e6d1a45 100644
--- a/main/admin/user_move_stats.php
+++ b/main/admin/user_move_stats.php
@@ -537,21 +537,13 @@ if (isset($_REQUEST['load_ajax'])) {
     exit;
 }
 
-
-
-
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/thickbox.js" type="text/javascript" language="javascript"></script>';
-
 $htmlHeadXtra[]='<style type="text/css" media="all">@import "'.api_get_path(WEB_LIBRARY_PATH).'javascript/thickbox.css";</style>';
 
-
 $htmlHeadXtra[] = '<script type="text/javascript">
 
    function moveto (unique_id, user_id) {
         var session_id = document.getElementById(unique_id).options[document.getElementById(unique_id).selectedIndex].value;
-
-
          $.ajax({
             contentType: "application/x-www-form-urlencoded",
             beforeSend: function(objeto) {
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 8edf38543d..ba6c893948 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -166,7 +166,6 @@ if ((empty($originalresource) || ($originalresource!=='no')) and (!empty($action
 */
 
 $htmlHeadXtra[] = AnnouncementManager::to_javascript();
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
     $("#emailTitle").focus();
diff --git a/main/auth/courses.php b/main/auth/courses.php
index ae2768e610..4719fcd6f1 100755
--- a/main/auth/courses.php
+++ b/main/auth/courses.php
@@ -28,9 +28,6 @@ if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
 	$htmlHeadXtra[] = '<script type="text/javascript">' .
 				  	  'var GB_ROOT_DIR = "'.api_get_path(WEB_LIBRARY_PATH).'javascript/greybox/"' .
 				  	  '</script>';
-
-	$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>';
-
 	$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/greybox/AJS.js" type="text/javascript" language="javascript"></script>';
 	$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/greybox/AJS_fx.js" type="text/javascript" language="javascript"></script>';
 	$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/greybox/gb_scripts.js" type="text/javascript" language="javascript"></script>';
diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 1aa61fdd8b..efbe17b151 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -35,7 +35,6 @@ $MonthsLong = api_get_months_long();
 */
 
 $htmlHeadXtra[] = to_javascript();
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
 $("#agenda_title").focus();
diff --git a/main/course_home/course_home.php b/main/course_home/course_home.php
index a5313128b7..6be4722923 100755
--- a/main/course_home/course_home.php
+++ b/main/course_home/course_home.php
@@ -41,7 +41,6 @@ require dirname(__FILE__).'/../inc/global.inc.php';
 unset($_SESSION['oLP']);
 unset($_SESSION['lpobject']);
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] ='<script type="text/javascript">
 $(document).ready(function() {
 	$(".make_visible_and_invisible").attr("href", "javascript:void(0);");
diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php
index f854b5fd51..a25faad814 100755
--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
@@ -43,7 +43,6 @@ if ($course_validation_feature) {
     require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
 }
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
     $("#title").focus();
diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css
index cc284cfc3d..121f178054 100755
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@@ -1348,65 +1348,38 @@ a.personal_agenda:hover, a.personal_agenda:hover {
 /*****************************************************
  *  DISPLAY MESSAGES	                             *
  *****************************************************/
-/* normal and erro message-box */
-.normal-message {
-    position: relative;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    min-height: 30px;
-    border-width: 1px;
-    border-style: solid;
-    -moz-border-radius: 10px;    
-    padding: 6px;
-    color: #00407F;
-	background-color: #EAF8FE;
+.normal-message {    
+    color: #00407F;	
     border: 1px solid #CDE6F5;	
     background: url("images/background_message.png") repeat-x scroll 0 0 #EAF8FE;
 }
-.warning-message {
-    position: relative;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    border-width: 1px;
-    border-style: solid;
-    -moz-border-radius: 10px;
-    padding: 6px;
+.warning-message {    
     border: 1px solid #FFB30F;
     color: #000;    
-    min-height: 30px;
 	background: url("images/background_message.png") repeat-x scroll 0 0 #FFEFA7;
 }
-.confirmation-message {    
-    border-color:#1F8323;
-    -moz-border-radius: 10px;
+.confirmation-message {
+	border: 1px solid #1F8323;
     color:#1F8323;
-    position: relative;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    border-width: 1px;
-    border-style: solid;
-    padding:6px;
-    min-height: 30px;
 	background: url("images/background_message.png") repeat-x scroll 0 0 #CAF0C7;
 }
-.error-message {
-    position: relative;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    border-width: 1px;
-    border-style: solid;
-    -moz-border-radius: 10px;
-    padding: 6px;
+.error-message {        
     border: 1px solid #FF0000;
-    color: #440000;    
-    min-height: 30px;
+    color: #440000;
 	background: url("images/background_message.png") repeat-x scroll 0 0 #FFD1D1;
 }
-.confirmation-message .bottom-link, .error-message .bottom-link, .normal-message .bottom-link, .warning-message .bottom-link {
-    position: absolute;
-    bottom: 0.2em;
-    right: 0.5em;
+.confirmation-message, .error-message, .normal-message, .warning-message {
+	min-height: 30px;
+	position: relative;
+    margin-top: 10px;
+    margin-bottom: 10px;	
+    -moz-border-radius: 10px;
+    border-radius: 10px;    
+	border-width: 1px;
+    border-style: solid;
+	padding:6px;	
 }
+
 /* New training */
 .bottom-link {
     border: 2px outset;
diff --git a/main/document/create_document.php b/main/document/create_document.php
index e1d7e52387..6730007425 100755
--- a/main/document/create_document.php
+++ b/main/document/create_document.php
@@ -17,10 +17,8 @@ require_once '../inc/global.inc.php';
 $_SESSION['whereami'] = 'document/create';
 $this_section = SECTION_COURSES;
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
-function InnerDialogLoaded()
-{
+function InnerDialogLoaded() {
 	/*
 	var B=new window.frames[0].FCKToolbarButton(\'Templates\',window.frames[0].FCKLang.Templates);
 	return B.ClickFrame();
diff --git a/main/document/showinframes.php b/main/document/showinframes.php
index 686cf9a0ce..89622f79e0 100755
--- a/main/document/showinframes.php
+++ b/main/document/showinframes.php
@@ -142,7 +142,6 @@ if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
                                 //   });';
 }
 
-$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js"></script>';
 $htmlHeadXtra[] = '<script type="text/javascript">
 <!--
     var jQueryFrameReadyConfigPath = \''.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js\';
diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php
index 6237f997aa..33e2354fd2 100755
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
@@ -11,13 +11,12 @@
 
 $this_section = SECTION_COURSES;
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
-$("#category_title").focus();
+    $("#category_title").focus();
 }
 $(document).ready(function () {
-  setFocus();
+    setFocus();
 });
 </script>';
 
diff --git a/main/exercice/exercice_submit.php b/main/exercice/exercice_submit.php
index 6fb10c46ee..45a63c0ce5 100755
--- a/main/exercice/exercice_submit.php
+++ b/main/exercice/exercice_submit.php
@@ -39,7 +39,6 @@ if($debug) { error_log('Entered exercise_submit.php: '.print_r($_POST,1)); }
 // Notice for unauthorized people.
 api_protect_course_script(true);
 $is_allowedToEdit = api_is_allowed_to_edit(null,true);
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 
 if (api_get_setting('show_glossary_in_extra_tools') == 'true') {
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/glossary.js" type="text/javascript" language="javascript"></script>'; //Glossary
diff --git a/main/exercice/exercise_admin.php b/main/exercice/exercise_admin.php
index 1f3e033122..33085b0eb3 100755
--- a/main/exercice/exercise_admin.php
+++ b/main/exercice/exercise_admin.php
@@ -123,7 +123,6 @@ $htmlHeadXtra[] = '<script type="text/javascript">
                    
 		</script>';
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
     $("#exercise_title").focus();
diff --git a/main/exercice/question_create.php b/main/exercice/question_create.php
index bf8ff367fb..581a3dbdd2 100755
--- a/main/exercice/question_create.php
+++ b/main/exercice/question_create.php
@@ -40,8 +40,7 @@ $form->addElement('select', 'question_type', get_lang('QuestionType'), $question
 
 // the question types (jquery form element)
 $form->addElement('hidden', 'question_type_hidden', get_lang('QuestionType'), array('id'=>'question_type_hidden'));
-$form->addElement('static','','<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript"></script>
-							<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.customselect.js" type="text/javascript"></script>');
+$form->addElement('static','','<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.customselect.js" type="text/javascript"></script>');
 $form->addElement('static','select_question_type', get_lang('QuestionType'),'<div id="questiontypes"></div>');
 
 //session id
diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index e79b97616e..42976e42ba 100755
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -30,7 +30,6 @@ get_notifications_of_user();
 
 /* Javascript */
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
     $("#forum_title").focus();
diff --git a/main/forum/forumqualify.php b/main/forum/forumqualify.php
index a65ce4fcc1..0f6c607f8f 100755
--- a/main/forum/forumqualify.php
+++ b/main/forum/forumqualify.php
@@ -35,7 +35,6 @@ $nameTools=get_lang('ToolForum');
 
 /*     Including necessary files */
 
-$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/jquery.js" ></script>';
 $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
                                         $(document).ready(function(){ $(\'.hide-me\').slideUp() });
                                     function hidecontent(content){ $(content).slideToggle(\'normal\'); }
diff --git a/main/forum/index.php b/main/forum/index.php
index e4dedf133c..4b3d5b0f96 100755
--- a/main/forum/index.php
+++ b/main/forum/index.php
@@ -27,7 +27,6 @@ $language_file = 'forum';
 
 // Including the global initialization file.
 require_once '../inc/global.inc.php';
-$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/jquery.js" ></script>';
 $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
     $(document).ready(function(){ $(\'.hide-me\').slideUp() });
     function hidecontent(content){ $(content).slideToggle(\'normal\'); }
diff --git a/main/forum/viewforumcategory.php b/main/forum/viewforumcategory.php
index 8b0f992d16..fb7f65e7b8 100755
--- a/main/forum/viewforumcategory.php
+++ b/main/forum/viewforumcategory.php
@@ -28,7 +28,6 @@ $language_file = 'forum';
 // Including the global initialization file.
 require '../inc/global.inc.php';
 
-$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/jquery.js" ></script>';
 $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
     $(document).ready(function(){ $(\'.hide-me\').slideUp() });
     function hidecontent(content){ $(content).slideToggle(\'normal\'); }
diff --git a/main/forum/viewpost.php b/main/forum/viewpost.php
index c2ca133372..895e10721c 100755
--- a/main/forum/viewpost.php
+++ b/main/forum/viewpost.php
@@ -26,7 +26,6 @@ $nameTools = get_lang('ToolForum');
 require 'forumconfig.inc.php';
 require_once 'forumfunction.inc.php';
 
-$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/jquery.js" ></script>';
 $htmlHeadXtra[] = '<script language="javascript">
                                         $(document).ready(function(){ $(\'.hide-me\').slideUp() });
                                     function hidecontent(content){ $(content).slideToggle(\'normal\'); }
diff --git a/main/glossary/index.php b/main/glossary/index.php
index 8136329466..81e3a3ea01 100755
--- a/main/glossary/index.php
+++ b/main/glossary/index.php
@@ -25,13 +25,12 @@ require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
 // Additional javascripts.
 $htmlHeadXtra[] = GlossaryManager::javascript_glossary();
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
-$("#glossary_title").focus();
+    $("#glossary_title").focus();
 }
 $(document).ready(function () {
-  setFocus();
+    setFocus();
 });
 </script>';
 // setting the tool constants
diff --git a/main/gradebook/gradebook.php b/main/gradebook/gradebook.php
index 0f516219bb..82741ef43a 100755
--- a/main/gradebook/gradebook.php
+++ b/main/gradebook/gradebook.php
@@ -28,7 +28,6 @@ require_once 'lib/fe/userform.class.php';
 require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
-$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
 	for (i=0;i<$(".actions").length;i++) {
diff --git a/main/gradebook/gradebook_flatview.php b/main/gradebook/gradebook_flatview.php
index cfc8ab6317..babd2c1d5c 100755
--- a/main/gradebook/gradebook_flatview.php
+++ b/main/gradebook/gradebook_flatview.php
@@ -27,8 +27,6 @@ if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
 	exit;
 }
 
-$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
-
 $interbreadcrumb[] = array ('url' => $_SESSION['gradebook_dest'].'?selectcat=1', 'name' => get_lang('ToolGradebook'));
 
 $showeval = isset($_POST['showeval']) ? '1' : '0';
diff --git a/main/gradebook/index.php b/main/gradebook/index.php
index 12091ec9a0..c3130c8d76 100755
--- a/main/gradebook/index.php
+++ b/main/gradebook/index.php
@@ -32,7 +32,6 @@ require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
 require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
-$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
 	for (i=0;i<$(".actions").length;i++) {
diff --git a/main/group/group.php b/main/group/group.php
index e953cf3e2d..3e2a4df331 100755
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -25,7 +25,6 @@ $this_section = SECTION_COURSES;
 // Notice for unauthorized people.
 api_protect_course_script(true);
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
 	for (i=0;i<$(".actions").length;i++) {
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 89d0c184cc..cbae99fcf3 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -854,10 +854,9 @@ class MessageManager
 	 * @param int group id
 	 */
 	public static function display_messages_for_group($group_id) {
-
 		global $my_group_role;
-
 		$rows = self::get_messages_by_group($group_id);
+		 
 		$rows = self::calculate_children($rows);
 		$group_info = GroupPortalManager::get_group_data($group_id);
 		$current_user_id = api_get_user_id();
@@ -981,14 +980,104 @@ class MessageManager
 
 		return $html_messages;
 	}
+	
+
+    /**
+     * Displays messages of a group with nested view
+     * @param int group id
+     */
+    public static function display_title_messages_for_group($group_id) {
+        global $my_group_role;
+        $rows = self::get_messages_by_group($group_id);             
+        $rows = self::calculate_children($rows);
+        $group_info = GroupPortalManager::get_group_data($group_id);
+        $current_user_id = api_get_user_id();
+        $topics_per_page = 5;
+        $items_per_page = 3;
+        $count_items = 0;
+        $html_messages = '';
+        $query_vars = array('id'=>$group_id,'topics_page_nr'=>0);
+
+        if (is_array($rows) && count($rows)> 0) {
+
+            // prepare array for topics with its items
+            $topics = array();
+            $x = 0;
+            foreach ($rows as $index=>$value) {
+                if (empty($value['parent_id'])) {
+                    $x = $index;
+                    $topics[$x] = $value;
+                } else {
+                    $topics[$x]['items'][] = $value;
+                }
+            }
+            uasort($topics,array('MessageManager','order_desc_date'));
+
+            $param_names = array_keys($_GET);
+            $array_html = array();
+            foreach ($topics as $index => $topic) {
+                $html = '';
+                // topics
+                $indent = 0;
+                $user_sender_info = UserManager::get_user_info_by_id($topic['user_sender_id']);
+                $files_attachments = self::get_links_message_attachment_files($topic['id']);
+                $name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']);
+
+                $html .= '<div class="rounded_div" style="width:620px">';           
+                    
+                        $html .= '<a href="#" class="head" id="head_'.$topic['id'].'">';
+                        $html .= '<span class="message-group-title-topic">'.(((isset($_GET['anchor_topic']) && $_GET['anchor_topic'] == 'topic_'.$topic['id']) || in_array('items_'.$topic['id'].'_page_nr',$param_names))?Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align: middle')):
+                                    Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align: middle'))).'
+                                    '.Security::remove_XSS($topic['title']).'</span>';
+                        $html .= '</a>';
+
+                        if ($topic['send_date']!=$topic['update_date']) {
+                            if (!empty($topic['update_date']) && $topic['update_date'] != '0000-00-00 00:00:00' ) {
+                                $html .= '<span class="message-group-date" > ('.get_lang('LastUpdate').' '.date_to_str_ago($topic['update_date']).')</span>';
+                            }
+                        } else {
+                            $html .= '<span class="message-group-date"> <i>'.get_lang('Created').' '.date_to_str_ago($topic['send_date']).'</i></span>';
+                        }
+
+                        $html .= '<div id="topic_'.$topic['id'].'" >';
+                            $html .= '<a name="topic_'.$topic['id'].'"></a>';
+                            $html.= '<div style="margin-bottom:10px">';
+                                $html.= '<div id="message-reply-link" style="margin-right:10px">
+                                         <a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
+
+                                if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
+                                    $html.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';
+                                }
+                                $html.= '</div>';
+                                $html.= '<br />';
+                                    $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true);                           $image_repository = $image_path['dir'];
+                                    $existing_image = $image_path['file'];
+                                $html.= '<div class="message-group-author"><img src="'.$image_repository.$existing_image.'" alt="'.$name.'"  width="44" height="44" title="'.$name.'" />&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a></div>';
+                                $html.= '<div class="message-group-content">'.$topic['content'].'</div>';
+                                $html.= '<div class="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>';
+                            $html.= '</div>';
+                $html .= '</div>';                
+                $html .= '</div>'; //rounded_div
+                
+                $array_html[] = array($html);
+            }
+            // grids for items and topics  with paginations
+
+            //$html_messages .= '<div class="social-box-container2">';
+            $html_messages .= Display::return_sortable_grid('topics', array(), $array_html, array('hide_navigation'=>false, 'per_page' => $topics_per_page), $query_vars, false, array(true, true, true,false), false);
+            //$html_messages .= '</div>';
+        }
+
+        return $html_messages;
+    }
 
+	
 	/**
 	 * Add children to messages by id is used for nested view messages
 	 * @param array  rows of messages
 	 * @return array new list adding the item children
 	 */
 	public static function calculate_children($rows) {
-
 		foreach($rows as $row) {
 			$rows_with_children[$row["id"]]=$row;
 			$rows_with_children[$row["parent_id"]]["children"][]=$row["id"];
diff --git a/main/inc/lib/search/search_widget.php b/main/inc/lib/search/search_widget.php
index 4375b6260a..fb05fb9d2c 100755
--- a/main/inc/lib/search/search_widget.php
+++ b/main/inc/lib/search/search_widget.php
@@ -17,8 +17,7 @@ require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
  * @param   array $htmlHeadXtra     A reference to the doc $htmlHeadXtra
  */
 function search_widget_prepare(&$htmlHeadXtra) {
-    $htmlHeadXtra[] = '
-    <script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js"></script>
+    $htmlHeadXtra[] = '    
     <script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.autocomplete.js"></script>
     <script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'search/search_widget.js"></script>
     <link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.autocomplete.css" />
diff --git a/main/link/link.php b/main/link/link.php
index 31535a2f22..835ee023e0 100755
--- a/main/link/link.php
+++ b/main/link/link.php
@@ -31,7 +31,6 @@ require_once 'linkfunctions.php';
 $this_section = SECTION_COURSES;
 api_protect_course_script();
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
 	for (i=0;i<$(".actions").length;i++) {
diff --git a/main/mySpace/access_details.php b/main/mySpace/access_details.php
index 614956cd1e..a32e983fc4 100755
--- a/main/mySpace/access_details.php
+++ b/main/mySpace/access_details.php
@@ -172,7 +172,6 @@ if (isset($_GET['origin']) && strcmp($_GET['origin'], 'tracking_course') === 0)
 	$interbreadcrumb[] = array ("url" => "javascript: void(0);", "name" => get_lang("Details"));
 }
 
-$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function load_results(type) {
         $.ajax({
diff --git a/main/newscorm/lp_add.php b/main/newscorm/lp_add.php
index 8dcf9c0cc0..9417b4c8fd 100755
--- a/main/newscorm/lp_add.php
+++ b/main/newscorm/lp_add.php
@@ -38,7 +38,6 @@ $currentstyle = api_get_setting('stylesheets');
 //$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'css/'.$currentstyle.'/learnpath.css"/>';
 //$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="learnpath.css" />'; //will be a merged with original learnpath.css
 $htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="dtree.css" />'; //will be moved
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
 $("#learnpath_title").focus();
diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php
index a3777cd51f..18da9000ea 100755
--- a/main/newscorm/lp_view.php
+++ b/main/newscorm/lp_view.php
@@ -44,7 +44,6 @@ $my_style       = $platform_theme;
 /*  Header  */
 
 // Se incluye la libreria en el lp_controller.php
-// $htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>';
 
 $htmlHeadXtra[] = api_get_jquery_ui_js(); //jQuery-UI
 
diff --git a/main/notebook/index.php b/main/notebook/index.php
index 476ec536dc..39747317e2 100755
--- a/main/notebook/index.php
+++ b/main/notebook/index.php
@@ -26,7 +26,6 @@ require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
 // Additional javascript
 $htmlHeadXtra[] = NotebookManager::javascript_notebook();
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
 $("#note_title").focus();
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index 33f0928840..27e1485a85 100755
--- a/main/survey/create_new_survey.php
+++ b/main/survey/create_new_survey.php
@@ -33,7 +33,6 @@ require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
 		function advanced_parameters() {
 			if(document.getElementById(\'options\').style.display == \'none\') {
@@ -46,7 +45,7 @@ $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
 		}
 
 		function setFocus(){
-		$("#surveycode_title").focus();
+		  $("#surveycode_title").focus();
 		}
 		$(document).ready(function () {
 		  setFocus();
diff --git a/main/survey/question.php b/main/survey/question.php
index f67b661e55..95b782edfe 100755
--- a/main/survey/question.php
+++ b/main/survey/question.php
@@ -18,7 +18,6 @@ require '../inc/global.inc.php';
 //require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
 require_once 'survey.lib.php';
 
-$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 						$(document).ready( function() {
 							$("button").click(function() {
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index 048535be6f..fe3384124d 100644
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -16,10 +16,9 @@ $config['survey']['debug'] = false;
 require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
 require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
 		function setFocus(){
-		$("#search_title").focus();
+		  $("#search_title").focus();
 		}
 		$(document).ready(function () {
 		  setFocus();
diff --git a/main/tracking/question_course_report.php b/main/tracking/question_course_report.php
index d95893169b..cc1e22706c 100644
--- a/main/tracking/question_course_report.php
+++ b/main/tracking/question_course_report.php
@@ -43,7 +43,6 @@ $global = true;
 
 $course_list = $course_select_list = array();
 $course_select_list[0] = get_lang('None');
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 
 $htmlHeadXtra[] = '
 <script type="text/javascript">
diff --git a/main/work/work.php b/main/work/work.php
index 6ad4f7f966..f504308103 100755
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -86,7 +86,6 @@ $ctok = $_SESSION['sec_token'];
 $stok = Security::get_token();
 
 $htmlHeadXtra[] = to_javascript_work();
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
 $("#work_title").focus();
diff --git a/user_portal.php b/user_portal.php
index f241d3d09a..142b456224 100755
--- a/user_portal.php
+++ b/user_portal.php
@@ -52,7 +52,6 @@ require_once $libpath.'sessionmanager.lib.php';
 
 api_block_anonymous_users(); // Only users who are logged in can proceed.
 
-//$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>';
 //$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.toggle.js" type="text/javascript" language="javascript"></script>';
 
 /* Table definitions */