diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index 0b644390..51d7092a 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -203,7 +203,7 @@ class CommentListTheme extends Themelet {
 				$hash = md5(strtolower($comment->owner_email));
 				$h_avatar = "<img src=\"http://www.gravatar.com/avatar/$hash.jpg\"><br>";
 			}
-			$h_reply = " - <a href='javascript: replyTo($i_image_id, $i_comment_id)'>Reply</a>";
+			$h_reply = " - <a href='javascript: replyTo($i_image_id, $i_comment_id, \"$h_name\")'>Reply</a>";
 			$h_ip = $user->can("view_ip") ? "<br>".show_ip($comment->poster_ip, "Comment posted {$comment->posted}") : "";
 			$h_del = $user->can("delete_comment") ?
 				' - <a onclick="return confirm(\'Delete comment by '.$h_name.':\\n'.$stripped_nonl.'\');" '.
diff --git a/lib/shimmie.js b/lib/shimmie.js
index 4a7c5071..3b215126 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -164,9 +164,9 @@ function deleteCookie( name, path, domain ) {
 			";expires=Thu, 01-Jan-1970 00:00:01 GMT";
 }
 
-function replyTo(imageId, commentId) {
+function replyTo(imageId, commentId, userId) {
 	var box = $("#comment_on_"+imageId);
-	var text = ">>"+imageId+"#c"+commentId+": ";
+	var text = "[url=site://post/view/"+imageId+"#c"+commentId+"]@"+userId+"[/url]: ";
 
 	box.focus();
 	box.val(box.val() + text);