diff --git a/phpBB/templates/Default/viewforum_body.tpl b/phpBB/templates/Default/viewforum_body.tpl
index 38b68b1528..42aefcf059 100644
--- a/phpBB/templates/Default/viewforum_body.tpl
+++ b/phpBB/templates/Default/viewforum_body.tpl
@@ -46,7 +46,7 @@
               <td width="5%" align="center" valign="middle">{topicrow.REPLIES}</td>
               <td width="10%" align="center" valign="middle">{topicrow.TOPIC_POSTER}</td>
 	          <td width="5%" align="center" valign="middle">{topicrow.VIEWS}</td>
-	          <td width="15%" align="center" valign="middle">{topicrow.LAST_POST_TIME}<br />{L_BY} <a href="{topicrow.U_LAST_POST_USER_PROFILE}">{topicrow.LAST_POST_USER}</a></td>
+	          <td width="15%" align="center" valign="middle">{topicrow.LAST_POST}</td>
            </tr>
 	        <!-- END topicrow -->
 	       </table>
diff --git a/phpBB/templates/PSO/viewforum_body.tpl b/phpBB/templates/PSO/viewforum_body.tpl
index 0525965868..02f1667f09 100644
--- a/phpBB/templates/PSO/viewforum_body.tpl
+++ b/phpBB/templates/PSO/viewforum_body.tpl
@@ -31,7 +31,7 @@
 				<td bgcolor="{T_TD_COLOR1}" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{topicrow.REPLIES}</font></td>
 				<td bgcolor="{T_TD_COLOR2}" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><a href="{topicrow.U_TOPIC_POSTER_PROFILE}">{topicrow.TOPIC_POSTER}</a></font></td>
 				<td bgcolor="{T_TD_COLOR1}" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{topicrow.VIEWS}</font></td>
-				<td bgcolor="{T_TD_COLOR2}" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{topicrow.LAST_POST_TIME}<br />{L_BY} <a href="{topicrow.U_LAST_POST_USER_PROFILE}">{topicrow.LAST_POST_USER}</a></font></td>
+				<td bgcolor="{T_TD_COLOR2}" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{topicrow.LAST_POST}</font></td>
 			</tr>
 		    <!-- END topicrow -->
 			<tr>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 8b96e49f9c..fd93eca4e4 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -358,10 +358,10 @@ if($total_topics)
 			}
 //		}
 
-		$view_topic_url = append_sid("viewtopic.".$phpEx."?".POST_TOPIC_URL."=".$topic_id."&".$replies);
+		$view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&" . $replies);
 
 		$topic_poster = stripslashes($topic_rowset[$x]['username']);
-		$topic_poster_profile_url = append_sid("profile.$phpEx?mode=viewprofile&".POST_USERS_URL."=".$topic_rowset[$x]['user_id']);
+		$topic_poster_profile_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL."=" . $topic_rowset[$x]['user_id']);
 
 		$last_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$x]['post_time'], $board_config['default_timezone']);
 
@@ -374,7 +374,9 @@ if($total_topics)
 			$last_post_user = $topic_rowset[$x]['user2'];
 		}
 
-		$last_post_profile_url = append_sid("profile.$phpEx?mode=viewprofile&".POST_USERS_URL."=".$topic_rowset[$x]['id2']);
+		$last_post = $last_post_time . "<br />by ";
+		$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "="  . $topic_rowset[$x]['id2']) . "\">" . $last_post_user . "</a>&nbsp;";
+		$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $topic_rowset[$x]['topic_last_post_id']) . "#" . $topic_rowset[$x]['topic_last_post_id'] . "\"><img src=\"" . $images['latest_reply'] . "\" width=\"20\" height=\"11\" border=\"0\" alt=\"View Latest Post\"></a>";
 
 		$views = $topic_rowset[$x]['topic_views'];
 
@@ -388,11 +390,9 @@ if($total_topics)
 			"TOPIC_TITLE" => $topic_title,
 			"TOPIC_TYPE" => $topic_type,
 			"VIEWS" => $views,
-			"LAST_POST_TIME" => $last_post_time,
-			"LAST_POST_USER" => $last_post_user,
+			"LAST_POST" => $last_post,
 
 			"U_VIEW_TOPIC" => $view_topic_url,
-			"U_LAST_POST_USER_PROFILE" => $last_post_profile_url,
 			"U_TOPIC_POSTER_PROFILE" => $topic_poster_profile_url)
 		);
 	}