diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 1572473695..39ff7c2180 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -248,6 +248,9 @@ $template->assign_vars(array(
 
 	"PRIVMSG_IMG" => $icon_pm,
 
+	"PHP_SELF" => $PHP_SELF,
+	"REQUEST_URI" => $REQUEST_URI,
+
 	"L_USERNAME" => $lang['Username'],
 	"L_PASSWORD" => $lang['Password'],
 	"L_LOGIN" => $lang['Login'],
diff --git a/phpBB/language/lang_dutch/lang_main.php b/phpBB/language/lang_dutch/lang_main.php
index ee116b726c..b9d4ba51b9 100644
--- a/phpBB/language/lang_dutch/lang_main.php
+++ b/phpBB/language/lang_dutch/lang_main.php
@@ -245,7 +245,7 @@ $lang['All_Posts'] = "Alle berichten";
 $lang['Newest_First'] = "Nieuwste eerst";
 $lang['Oldest_First'] = "Oudste eerst";
 
-$lang['Return_to_top'] = "Naar boven";
+$lang['Back_to_top'] = "Naar boven";
 
 $lang['Read_profile'] = "Bekijk gebruikers profiel"; 
 $lang['Send_email'] = "Stuur een mail aan deze gebruiker";
diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index 815ef56dbf..eee0167f32 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -250,7 +250,7 @@ $lang['All_Posts'] = "All Posts";
 $lang['Newest_First'] = "Newest First";
 $lang['Oldest_First'] = "Oldest First";
 
-$lang['Return_to_top'] = "Return to top";
+$lang['Back_to_top'] = "Back to top";
 
 $lang['Read_profile'] = "View users profile"; 
 $lang['Send_email'] = "Send email to user";
diff --git a/phpBB/templates/subSilver/viewtopic_body.tpl b/phpBB/templates/subSilver/viewtopic_body.tpl
index bcae70f859..8090a507f7 100644
--- a/phpBB/templates/subSilver/viewtopic_body.tpl
+++ b/phpBB/templates/subSilver/viewtopic_body.tpl
@@ -1,6 +1,6 @@
 <table width="100%" cellspacing="2" cellpadding="2" border="0">
   <tr> 
-	<td align="left" valign="bottom" colspan="2"><span class="maintitle">{TOPIC_TITLE}</span><br />
+	<td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{PHP_SELF}">{TOPIC_TITLE}</a><br />
 	  <span class="gensmall"><b>{PAGINATION}</b><br />
 	  &nbsp; </span></td>
   </tr>
@@ -35,7 +35,7 @@
 	<td class="{postrow.ROW_CLASS}" height="28" valign="top"> 
 	  <table width="100%" border="0" cellspacing="0" cellpadding="0">
 		<tr> 
-		  <td width="100%">{postrow.MINI_POST_IMG}<span class="postdetails">{L_POSTED}: 
+		  <td width="100%"><a href="{U_MINI_POST}">{postrow.MINI_POST_IMG}</a><span class="postdetails">{L_POSTED}: 
 			{postrow.POST_DATE}<span class="gen">&nbsp;</span>&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: 
 			{postrow.POST_SUBJECT}</span></td>
 		  <td nowrap="nowrap" valign="top" align="right">{postrow.QUOTE_IMG} 
@@ -51,8 +51,8 @@
 	</td>
   </tr>
   <tr> 
-	<td width="22%" align="left" valign="middle" class="{postrow.ROW_CLASS}"><span class="nav"><a href="#top" class="nav">Back 
-	  to top</a></span></td>
+	<td width="22%" align="left" valign="middle" class="{postrow.ROW_CLASS}">
+	  <span class="nav"><a href="#top" class="nav">{L_BACK_TO_TOP}</a></span></td>
 	<td width="78%" height="28" class="{postrow.ROW_CLASS}" nowrap="nowrap" valign="bottom"> 
 	  <table cellspacing="0" cellpadding="0" border="0" height="18" width="18">
 		<tr> 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 34975446b4..994aefdfd6 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -573,6 +573,8 @@ $template->assign_vars(array(
 	"L_POST_NEW_TOPIC" => $post_alt, 
 	"L_POST_REPLY_TOPIC" => $reply_alt, 
 
+	"L_BACK_TO_TOP" => $lang['Back_to_top'],
+
 	"IMG_POST" => $post_img,
 	"IMG_REPLY" => $reply_img,
 
@@ -777,6 +779,8 @@ for($i = 0; $i < $total_posts; $i++)
 	{
 		$mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" title="' . $lang['Post'] . '" border="0" />';
 	}
+	
+	$mini_post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $postrow[$i]['post_id']) ."#".$postrow[$i]['post_id'];
 
 	//
 	// Generate ranks
@@ -1068,6 +1072,8 @@ for($i = 0; $i < $total_posts; $i++)
 		"IP_IMG" => $ip_img, 
 		"DELETE_IMG" => $delpost_img, 
 
+		"U_MINI_POST" => $mini_post_url,
+
 		"U_POST_ID" => $postrow[$i]['post_id'])
 	);
 }