Index: wp-includes/js/swfupload/handlers.dev.js
===================================================================
--- wp-includes/js/swfupload/handlers.dev.js	(revision 12261)
+++ wp-includes/js/swfupload/handlers.dev.js	(working copy)
@@ -114,7 +114,7 @@
 				jQuery('.filename .trashnotice', item).remove();
 				jQuery('a.undo', item).addClass('hidden');
 				jQuery('a.describe-toggle-on, .menu_order_input', item).show();
-				item.animate( {backgroundColor: '#fff'}, { queue: false, duration: 200, complete: function(){ jQuery(this).css({backgroundColor:''}); } });
+				item.animate( {backgroundColor: '#fff'}, { queue: false, duration: 200, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('trash-undo');
 			}
 		});
 		return false;
@@ -132,6 +132,8 @@
 }
 
 function deleteSuccess(data, textStatus) {
+	jQuery('.trash-undo').remove();
+	
 	if ( data == '-1' )
 		return itemAjaxError(this.id, 'You do not have permission. Has your session expired?');
 	if ( data == '0' )
@@ -153,13 +155,17 @@
 	// Vanish it.
 	jQuery('.toggle', item).toggle();
 	jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden');
-	item.css( {backgroundColor:'#fff'} ).animate( {backgroundColor:'#ffc0c0'}, {queue:false, duration:500} );
+	item.css( {backgroundColor:'#fff'} ).animate( {backgroundColor:'#ffc0c0'}, {queue:false, duration:500} ).addClass('trash-undo');
 
 	jQuery('.filename:empty', item).remove();
 	jQuery('.filename', item).append('<span class="trashnotice"> ' + swfuploadL10n.deleted + ' </span>').siblings('a.toggle').hide();
 	jQuery('.filename', item).append( jQuery('a.undo', item).removeClass('hidden') );
 	jQuery('.menu_order_input', item).hide();
 
+	to = window.setTimeout( function(){
+		item.fadeOut('slow', function(){ $(this).remove(); });
+	}, 15000 );
+	
 	return;
 }
 
Index: wp-admin/js/edit-comments.dev.js
===================================================================
--- wp-admin/js/edit-comments.dev.js	(revision 12261)
+++ wp-admin/js/edit-comments.dev.js	(working copy)
@@ -40,6 +40,8 @@
 		settings.data._url = document.location.href;
 
 		if ( cl.indexOf(':trash=1') != -1 ) {
+			$('.trash-undo').remove();
+			
 			id = cl.replace(/.*?comment-([0-9]+).*/, '$1');
 			el = $('#comment-' + id);
 			note = $('#undo-holder').html();
@@ -49,19 +51,20 @@
 
 			if ( el.is('tr') ) {
 				n = el.children(':visible').length;
-				author = $('.author strong', el).html();
-				h = $('<tr id="trashundo-' + id + '" style="display:none;"><td class="trash-undo" colspan="' + n + '">' + note + '</td></tr>');
+				author = $('.author strong', el).text();
+				h = $('<tr id="trashundo-' + id + '" class="trash-undo" style="display:none;"><td colspan="' + n + '">' + note + '</td></tr>');
 			} else {
-				author = $('.comment-author', el).html();
+				author = $('.comment-author', el).text();
 				h = $('<div id="trashundo-' + id + '" style="display:none;" class="trash-undo">' + note + '</div>');
 			}
 
 			el.before(h);
 
-			$('strong', '#trashundo-' + id).html(author + ' ');
+			$('strong', '#trashundo-' + id).text(author + ' ');
 			a = $('a.undo-trash', '#trashundo-' + id);
 			a.attr('href', 'comment.php?action=untrashcomment&c=' + id + '&_ajax_nonce=' + settings.data._ajax_nonce);
 			a.attr('className', 'delete:the-comment-list:comment-' + id + '::untrash=1 vim-z vim-destructive');
+			$('.avatar', el).clone().prependTo('#trashundo-' + id + ' .trash-undo-inside');
 
 			a.click(function(){
 				list.wpList.del(this);
@@ -72,12 +75,9 @@
 				return false;
 			});
 
-			if ( to )
-				window.clearTimeout(to);
-
 			to = window.setTimeout( function(){
 				$('#trashundo-' + id).fadeOut('slow', function(){ $(this).remove(); });
-			}, 7000 );
+			}, 15000 );
 		}
 
 		return settings;
@@ -305,6 +305,8 @@
 	},
 
 	open : function(id, p, a) {
+		$('.trash-undo').remove();
+		
 		var t = this, editRow, rowData, act, h, c = $('#comment-' + id);
 		t.close();
 		t.cid = id;
Index: wp-admin/wp-admin.dev.css
===================================================================
--- wp-admin/wp-admin.dev.css	(revision 12261)
+++ wp-admin/wp-admin.dev.css	(working copy)
@@ -3520,12 +3520,20 @@
 	border-top-style: solid;
 	border-top-width: 1px;
 	margin: 0 -10px;
-	padding: 3px;
+	padding: 3px 8px;
+	font-size: 11px;
 }
 
 .trash-undo-inside {
-	margin: 3px 8px;
+	margin: 3px 8px 3px 0;
+	line-height: 16px;
 }
+.trash-undo-inside .avatar {
+	height: 16px;
+	width: 16px;
+	margin-right: 8px;
+	vertical-align: middle;
+}
 
 /* tag hints */
 .taghint {
Index: wp-admin/css/colors-classic.dev.css
===================================================================
--- wp-admin/css/colors-classic.dev.css	(revision 12261)
+++ wp-admin/css/colors-classic.dev.css	(working copy)
@@ -1686,7 +1686,7 @@
 }
 
 .trash-undo {
-	background-color: #ebffe0;
+	background-color: #ffc0c0;
 }
 
 #dashboard_recent_comments .trash-undo {
Index: wp-admin/css/colors-fresh.dev.css
===================================================================
--- wp-admin/css/colors-fresh.dev.css	(revision 12261)
+++ wp-admin/css/colors-fresh.dev.css	(working copy)
@@ -1675,7 +1675,7 @@
 }
 
 .trash-undo {
-	background-color: #ebffe0;
+	background-color: #ffc0c0;
 }
 
 #dashboard_recent_comments .trash-undo {