diff --git a/src/wp-admin/js/comment.js b/src/wp-admin/js/comment.js
index eb41e4dc39..4f15b51e76 100644
--- a/src/wp-admin/js/comment.js
+++ b/src/wp-admin/js/comment.js
@@ -3,48 +3,54 @@ jQuery(document).ready( function($) {
 
 	postboxes.add_postbox_toggles('comment');
 
-	var stamp = $('#timestamp').html();
-	$('.edit-timestamp').click(function () {
-		if ($('#timestampdiv').is(':hidden')) {
-			$('#timestampdiv').slideDown('normal');
-			$('.edit-timestamp').hide();
+	var $timestampdiv = $('#timestampdiv'),
+		stamp = $('#timestamp').html();
+
+	$timestampdiv.siblings('a.edit-timestamp').click( function( event ) {
+		if ( $timestampdiv.is( ':hidden' ) ) {
+			$timestampdiv.slideDown('fast');
+			$('#mm').focus();
+			$(this).hide();
 		}
-		return false;
+		event.preventDefault();
 	});
 
-	$('.cancel-timestamp').click(function() {
-		$('#timestampdiv').slideUp('normal');
+	$timestampdiv.find('.cancel-timestamp').click( function( event ) {
+		$timestampdiv.slideUp('fast').siblings('a.edit-timestamp').show().focus();
 		$('#mm').val($('#hidden_mm').val());
 		$('#jj').val($('#hidden_jj').val());
 		$('#aa').val($('#hidden_aa').val());
 		$('#hh').val($('#hidden_hh').val());
 		$('#mn').val($('#hidden_mn').val());
 		$('#timestamp').html(stamp);
-		$('.edit-timestamp').show();
-		return false;
+		event.preventDefault();
 	});
 
-	$('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
+	$timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels
 		var aa = $('#aa').val(), mm = $('#mm').val(), jj = $('#jj').val(), hh = $('#hh').val(), mn = $('#mn').val(),
 			newD = new Date( aa, mm - 1, jj, hh, mn );
 
+		event.preventDefault();
+
 		if ( newD.getFullYear() != aa || (1 + newD.getMonth()) != mm || newD.getDate() != jj || newD.getMinutes() != mn ) {
-			$('.timestamp-wrap', '#timestampdiv').addClass('form-invalid');
-			return false;
+			$timestampdiv.find('.timestamp-wrap').addClass('form-invalid');
+			return;
 		} else {
-			$('.timestamp-wrap', '#timestampdiv').removeClass('form-invalid');
+			$timestampdiv.find('.timestamp-wrap').removeClass('form-invalid');
 		}
 
-		$('#timestampdiv').slideUp('normal');
-		$('.edit-timestamp').show();
 		$('#timestamp').html(
 			commentL10n.submittedOn + ' <b>' +
-			$( '#mm option[value="' + mm + '"]' ).text() + ' ' +
-			jj + ', ' +
-			aa + ' @ ' +
-			hh + ':' +
-			mn + '</b> '
+			commentL10n.dateFormat
+				.replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) )
+				.replace( '%2$s', parseInt( jj, 10 ) )
+				.replace( '%3$s', aa )
+				.replace( '%4$s', ( '00' + hh ).slice( -2 ) )
+				.replace( '%5$s', ( '00' + mn ).slice( -2 ) ) +
+				'</b> '
 		);
-		return false;
+
+		$timestampdiv.slideUp('fast');
+		$timestampdiv.siblings('a.edit-timestamp').show();
 	});
 });
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 8897e4af96..1fdb8993b3 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -523,7 +523,9 @@ function wp_default_scripts( &$scripts ) {
 		$scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
 		$scripts->add_data( 'comment', 'group', 1 );
 		did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array(
-			'submittedOn' => __('Submitted on:')
+			'submittedOn' => __( 'Submitted on:' ),
+			/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
+			'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' )
 		) );
 
 		$scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );