Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-posts.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-posts.php	(revision 4186)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-posts.php	(working copy)
@@ -23,11 +23,31 @@
 
 			<?php if ( 'topic' == get_post_type() ) : ?>
 
+				<div id="post-<?php bbp_topic_id(); ?>" class="bbp-topic-header">
+					<div class="bbp-meta">
+							<span class="bbp-header">
+								<?php esc_html_e( 'In forum: ', 'wporg-forums' ); ?>
+								<a class="bbp-forum-permalink" href="<?php bbp_forum_permalink( bbp_get_topic_forum_id() ); ?>"><?php bbp_forum_title( bbp_get_topic_forum_id() ); ?></a>
+								<?php esc_html_e( ' topic: ', 'wporg-forums' ); ?>
+								<?php bbp_topic_title( bbp_get_topic_id() ); ?>
+							</span>
+					</div><!-- .bbp-meta -->
+				</div><!-- #post-<?php bbp_topic_id(); ?> -->
+
 				<?php bbp_get_template_part( 'content', 'single-topic-lead' ); ?>
 
 			<?php // This actually works. ?>
 			<?php else : bbpress()->reply_query = bbpress()->topic_query; ?>
 
+				<div id="post-<?php bbp_reply_id(); ?>" class="bbp-reply-header">
+					<div class="bbp-meta">
+							<span class="bbp-header">
+								<?php esc_html_e( 'In reply to: ', 'wporg-forums' ); ?>
+								<a class="bbp-topic-permalink" href="<?php bbp_topic_permalink( bbp_get_reply_topic_id() ); ?>"><?php bbp_topic_title( bbp_get_reply_topic_id() ); ?></a>
+							</span>
+					</div><!-- .bbp-meta -->
+				</div><!-- #post-<?php bbp_reply_id(); ?> -->
+
 				<?php bbp_get_template_part( 'loop', 'single-reply' ); ?>
 
 			<?php endif; ?>
