diff --git a/upload/config.php b/upload/config.php
index b9dfffb16..fbfea1b9d 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,7 +56,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R451';
+$bb_cfg['tp_release_state'] = 'R452';
 $bb_cfg['tp_release_date'] = '04-09-2012';
 
 // Database
diff --git a/upload/misc/js/bbcode.js b/upload/misc/js/bbcode.js
index afbcd3d98..55d7888cb 100644
--- a/upload/misc/js/bbcode.js
+++ b/upload/misc/js/bbcode.js
@@ -13,6 +13,7 @@ BBCode.prototype = {
   textarea:   null,
   stext:      '',
   quoter:     null,
+  qouted_pid: null,
   collapseAfterInsert: false,
   replaceOnInsert: false,
 
@@ -23,7 +24,7 @@ BBCode.prototype = {
     // Tag for quoting.
     this.addTag(
       '_quoter',
-      function() { return '[quote="'+th.quoter+'"]' },
+      function() { return '[quote="'+th.quoter+'"][qpost='+th.qouted_pid+']' },
       '[/quote]\n',
       null,
       null,
@@ -37,10 +38,11 @@ BBCode.prototype = {
   },
 
   // Insert poster name or poster quotes to the text.
-  onclickPoster: function(name) {
+  onclickPoster: function(name, post_id) {
     var sel = this.getSelection()[0];
 		if (sel) {
 			this.quoter = name;
+			this.qouted_pid = post_id;
 			this.quoterText = sel;
 			this.insertTag('_quoter');
 		} else {
diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl
index d340fc368..fc5065b63 100644
--- a/upload/templates/default/viewtopic.tpl
+++ b/upload/templates/default/viewtopic.tpl
@@ -276,7 +276,7 @@ ajax.callback.mod_action = function(data) {
 		<p class="avatar">{postrow.POSTER_AVATAR}</p>
 	<!-- ELSE -->
 		<!-- IF QUICK_REPLY -->
-		<p class="nick" title="{L_INS_NAME_TIP}" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickPoster('{postrow.POSTER_NAME_JS}');">
+		<p class="nick" title="{L_INS_NAME_TIP}" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickPoster('{postrow.POSTER_NAME_JS}', {postrow.POST_ID});">
 			<a href="#" onclick="return false;">{postrow.POSTER_NAME}</a> <!-- IF postrow.POSTER_AUTHOR --><sup>&reg;</sup><!-- ENDIF -->
 		</p>
 		<!-- ELSE -->