-<span id="timestamp"><?php printf($stamp, $date); ?></span> <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a>
-<div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0); ?></div>
+<span id="timestamp"><?php printf( $stamp, $date ); ?></span>
+<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
+<fieldset id='timestampdiv' class='hide-if-js'>
+<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
+<?php touch_time( ( 'editcomment' === $action ), 0 ); ?>
+</fieldset>
+</div>
+
+<?php
+$post_id = $comment->comment_post_ID;
+if ( current_user_can( 'edit_post', $post_id ) ) {
+ $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+ $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+} else {
+ $post_link = esc_html( get_the_title( $post_id ) );
+}
+?>
+
+<div class="misc-pub-section misc-pub-response-to">
+ <?php printf(
+ /* translators: post link */
+ __( 'In response to: %s' ),
+ '<b>' . $post_link . '</b>'
+ ); ?>
+</div>
+
+<?php
+if ( $comment->comment_parent ) :
+ $parent = get_comment( $comment->comment_parent );
+ $parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
+ $name = get_comment_author( $parent->comment_ID );
+?>
+<div class="misc-pub-section misc-pub-reply-to">
+ <?php printf(
+ /* translators: comment link */
+ __( 'In reply to: %s' ),
+ '<b><a href="' . $parent_link . '">' . $name . '</a></b>'
+ ); ?>