diff --git a/admin/js/_media_item.js b/admin/js/_media_item.js
index efb8bc9d5..589a6f7b4 100644
--- a/admin/js/_media_item.js
+++ b/admin/js/_media_item.js
@@ -62,4 +62,10 @@ $(function() {
 		}
 		return true;
 	});
+
+	// Confirm for deleting current medoa
+	$('#delete-form input[name="delete"]').click(function() {
+		return window.confirm(dotclear.msg.confirm_delete_media);
+	});
+
 });
\ No newline at end of file
diff --git a/admin/media.php b/admin/media.php
index 11e4d7165..9b48263b9 100644
--- a/admin/media.php
+++ b/admin/media.php
@@ -217,7 +217,7 @@ if ($dir && $core->auth->isSuperAdmin() && !empty($_POST['rebuild']))
 
 
 # DISPLAY confirm page for rmdir & rmfile
-if ($dir && !empty($_GET['remove']))
+if ($dir && !empty($_GET['remove']) && empty($_GET['noconfirm']))
 {
 	call_user_func($open_f,__('Media manager'));
 	
diff --git a/admin/media_item.php b/admin/media_item.php
index 331105d52..d8d319b01 100644
--- a/admin/media_item.php
+++ b/admin/media_item.php
@@ -158,7 +158,13 @@ function dcGetImageTitle($file,$pattern)
 
 /* DISPLAY Main page
 -------------------------------------------------------- */
-$starting_scripts = dcPage::jsLoad('js/_media_item.js');
+$starting_scripts = 
+	'<script type="text/javascript">'."\n".
+	"//<![CDATA["."\n".
+	dcPage::jsVar('dotclear.msg.confirm_delete_media',__('Are you sure to delete this media?'))."\n".
+	"//]]>".
+	"</script>".
+	dcPage::jsLoad('js/_media_item.js');
 if ($popup) {
 	$starting_scripts .=
 	dcPage::jsLoad('js/jsToolBar/popup_media.js');
@@ -542,6 +548,19 @@ if ($file->editable && $core_media_writable)
 	$core->formNonce().'</p>'.
 	'</fieldset></form>';
 
+	if ($file->del) {
+		echo
+		'<form id="delete-form" method="post" action="'.html::escapeURL($media_page_url).
+		'&amp;d='.rawurlencode(dirname($file->relname)).
+		'&amp;remove='.rawurlencode($file->basename).'">'.
+		'<p><input name="delete" type="submit" class="delete" value="'.__('Delete this media').'" />'.
+		form::hidden('remove',rawurlencode($file->basename)).
+		form::hidden('rmyes',1).
+		$core->formNonce().'</p>'.
+		'</form>';
+	}
+
+
 	# --BEHAVIOR-- adminMediaItemForm
 	$core->callBehavior('adminMediaItemForm',$file);
 }
diff --git a/locales/fr/main.po b/locales/fr/main.po
index 4dd3ab745..5d9504341 100644
--- a/locales/fr/main.po
+++ b/locales/fr/main.po
@@ -1400,6 +1400,12 @@ msgstr "Date du fichier :"
 msgid "New directory:"
 msgstr "Nouveau répertoire :"
 
+msgid "Delete this media"
+msgstr "Supprimer ce média"
+
+msgid "Are you sure to delete this media?"
+msgstr "Êtes-vous sûr de vouloir supprimer ce média ?"
+
 msgid "Change file"
 msgstr "Changer le fichier"