diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php
index 2a009cff75..fe80392581 100644
--- a/main/inc/lib/database.lib.php
+++ b/main/inc/lib/database.lib.php
@@ -1,4 +1,4 @@
-<?php // $Id: database.lib.php 20642 2009-05-14 16:28:14Z yannoo $
+<?php // $Id: database.lib.php 20917 2009-05-20 18:47:47Z cfasanando $
 /* See license terms in /dokeos_license.txt */
 /**
 ==============================================================================
@@ -42,6 +42,7 @@ define('TABLE_MAIN_SHARED_SURVEY', 'shared_survey');
 define('TABLE_MAIN_SHARED_SURVEY_QUESTION', 'shared_survey_question');
 define('TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION', 'shared_survey_question_option');
 define('TABLE_MAIN_TEMPLATES', 'templates');
+define('TABLE_MAIN_SYSTEM_TEMPLATE', 'system_template');
 define('TABLE_MAIN_OPENID_ASSOCIATION','openid_association');
 //Gradebook
 define('TABLE_MAIN_GRADEBOOK_CATEGORY', 	'gradebook_category');
diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/Classes/ImageManager.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/Classes/ImageManager.php
index a79b2d2f33..c89c850cc5 100644
--- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/Classes/ImageManager.php
+++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/Classes/ImageManager.php
@@ -206,8 +206,23 @@ class ImageManager
 		$in_group = api_is_in_group();
 		$user_id = api_get_user_id();
 
+		// check templates files in bd
+		$tbl_system_template = Database :: get_main_table(TABLE_MAIN_SYSTEM_TEMPLATE);
+			
+		$sql = "SELECT image FROM $tbl_system_template ";
+		$res = Database::query($sql,__FILE__,__LINE__);
+
+		$files_templates = array();	
+		
+		while ($row = Database::fetch_row($res)) {
+			$files_templates[] = $row[0];
+		}				
+		
 		while (false !== ($entry = $d->read())) 
 		{
+
+			if (in_array($entry,$files_templates)) continue;
+
 			if (substr($entry,0,1) != '.'          //not a dot file or directory
 				&& strpos($entry, '_DELETED_') === false
 				&& strpos($entry, 'chat_files') === false