Index: /branches/release-38/default_templates/javascript.mtml
===================================================================
--- /branches/release-38/default_templates/javascript.mtml (revision 2280)
+++ /branches/release-38/default_templates/javascript.mtml (revision 2313)
@@ -501,5 +501,5 @@
 
     // Populate label with new values
-    var reply_text = '<__trans phrase="Replying to <a href="#comment-[_1]">comment from [_2]</a>" params="'+ parent_id +'%%'+ author +'">';
+    var reply_text = '<__trans phrase="Replying to <a href="[_1]" onclick="[_2]">comment from [_3]</a>" params="#comment-'+ parent_id +'%%location.href=this.href; return false%%'+ author +'">';
     label.innerHTML = reply_text;
 
Index: /branches/release-38/default_templates/comments.mtml
===================================================================
--- /branches/release-38/default_templates/comments.mtml (revision 2239)
+++ /branches/release-38/default_templates/comments.mtml (revision 2313)
@@ -20,10 +20,10 @@
                         <span class="byline">
                             <mt:IfCommentParent>
-                                <__trans phrase="[_1] replied to <a href="[_2]">comment from [_3]</a>" params="<$MTCommentAuthorIdentity$> <span class="vcard author"><$MTCommentAuthorLink$></span>%%<mt:CommentParent>#comment-<$MTCommentID$></mt:CommentParent>%%<mt:CommentParent><$MTCommentAuthor$></mt:CommentParent>">
+                                <__trans phrase="[_1] replied to <a href="[_2]">comment from [_3]</a>" params="<$MTCommentAuthorIdentity$> <span class="vcard author"><$MTCommentAuthorLink$></span>%%<mt:CommentParent><$mt:CommentLink$></mt:CommentParent>%%<mt:CommentParent><$MTCommentAuthor$></mt:CommentParent>">
                             <mt:else>
                                 <$MTCommentAuthorIdentity$>
                                 <span class="vcard author"><$MTCommentAuthorLink$></span>
                             </mt:IfCommentParent>
-                            | <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate relative="js"$></abbr></a>
+                            | <a href="<$mt:CommentLink$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate relative="js"$></abbr></a>
                             <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
                         </span>
Index: /branches/release-38/default_templates/comment_preview.mtml
===================================================================
--- /branches/release-38/default_templates/comment_preview.mtml (revision 2310)
+++ /branches/release-38/default_templates/comment_preview.mtml (revision 2313)
@@ -37,10 +37,10 @@
                                             <span class="byline">
                                                 <mt:IfCommentParent>
-                                                    <__trans phrase="[_1] replied to <a href="[_2]">comment from [_3]</a>" params="<$MTCommentAuthorIdentity$> <span class="vcard author"><$MTCommentAuthorLink$></span>%%<mt:CommentParent><mt:CommentEntry><mt:entrypermalink></mt:CommentEntry>#comment-<$MTCommentID$></mt:CommentParent>%%<mt:CommentParent><$MTCommentAuthor$></mt:CommentParent>">
+                                                    <__trans phrase="[_1] replied to <a href="[_2]">comment from [_3]</a>" params="<$MTCommentAuthorIdentity$> <span class="vcard author"><$MTCommentAuthorLink$></span>%%<mt:CommentParent><$mt:CommentLink$></mt:CommentParent>%%<mt:CommentParent><$MTCommentAuthor$></mt:CommentParent>">
                                                 <mt:else>
                                                     <$MTCommentAuthorIdentity$>
                                                     <span class="vcard author"><$MTCommentAuthorLink$></span>
                                                 </mt:IfCommentParent>
-                                                | <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
+                                                | <a href="<$mt:CommentLink$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
                                             </span>
                                         </div>
@@ -64,7 +64,7 @@
                                         <input type="hidden" name="entry_id" value="<$MTEntryID$>" />
                                         <input type="hidden" name="__lang" value="<$MTBlogLanguage$>" />
-                                        <mt:IfCommentParent>
-                                            <input type="hidden" name="parent_id" value="<mt:CommentParent><$MTCommentID$></mt:CommentParent>">
-                                        </mt:IfCommentParent>
+<mt:IfCommentParent>
+                                            <input type="hidden" name="parent_id" value="<$mt:CommentParentId$>" id="comment-parent-id">
+</mt:IfCommentParent>
                                         <div id="comments-open-data">
                                             <div id="comment-form-name">
@@ -81,4 +81,10 @@
                                             </div>
                                         </div>
+<mt:IfCommentParent>
+                                        <div id="comment-form-reply">
+                                            <input type="checkbox" id="comment-reply" name="comment_reply" value="<$mt:CommentParentId$>" checked="checked" onclick="mtSetCommentParentID()" />
+                                            <label for="comment-reply" id="comment-reply-label"><__trans phrase="Replying to comment from [_1]" params="<mt:CommentParent><$MTCommentAuthor$></mt:CommentParent>"></label>
+                                        </div>
+</mt:IfCommentParent>
                                         <div id="comments-open-text">
                                             <label for="comment-text"><__trans phrase="Comments"> <MTIfAllowCommentHTML><__trans phrase="(You may use HTML tags for style)"></MTIfAllowCommentHTML></label>