Index: branches/release-32/default_templates/comment_detail.mtml
===================================================================
--- branches/release-32/default_templates/comment_detail.mtml (revision 1350)
+++ branches/release-32/default_templates/comment_detail.mtml (revision 1561)
@@ -3,5 +3,12 @@
         <div class="comment-header">
             <div class="asset-meta">
-                <span class="byline"><__trans phrase="By [_1] on [_2]" params='<span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>%%<a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>'></span>
+               <span class="byline">
+                   <__trans phrase="By"> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>
+                   <MTCommentParent>
+                   <__trans phrase="replied to"> <a href="#comment-<$MTCommentID$>"><MTCommentAuthor></a>
+                   </MTCommentParent>
+                   <__trans phrase="on"> <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
+                   <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
+               </span>
             </div>
         </div>
Index: branches/release-32/default_templates/comment_form.mtml
===================================================================
--- branches/release-32/default_templates/comment_form.mtml (revision 1309)
+++ branches/release-32/default_templates/comment_form.mtml (revision 1561)
@@ -17,4 +17,5 @@
             <input type="hidden" name="entry_id" value="<$MTEntryID$>" />
             <input type="hidden" name="__lang" value="<$MTBlogLanguage$>" />
+            <input type="hidden" name="parent_id" value="<MTIf name="comment_preview_template"><$MTCommentParentID$></MTIf>" id="comment-parent-id" />
             <div id="comments-open-data">
                 <div id="comment-form-name">
@@ -33,4 +34,8 @@
                     <label for="comment-bake-cookie"><input type="checkbox" id="comment-bake-cookie" name="bakecookie" onclick="if (!this.checked) forgetMe(document.comments_form)" value="1" />
                         <__trans phrase="Remember personal info?"></label>
+                </div>
+                <div id="comment-form-reply">
+                    <label for="comment-reply" id="comment-reply-label"><input type="checkbox" id="comment-reply" name="comment_reply" value="" onclick="setCommentParentID();" />
+                        <__trans phrase="Replying to"></label>
                 </div>
             </div>
Index: branches/release-32/default_templates/javascript.mtml
===================================================================
--- branches/release-32/default_templates/javascript.mtml (revision 1354)
+++ branches/release-32/default_templates/javascript.mtml (revision 1561)
@@ -36,4 +36,5 @@
 
 function individualArchivesOnLoad(commenter_name) {
+    hideDocumentElement('comment-form-reply');
 <MTIfCommentsAccepted>
 <MTElse>
@@ -150,4 +151,42 @@
 </MTIfRegistrationAllowed>
 
+function replyComment(parent_id, author) {
+    showDocumentElement('comment-form-reply');
+    
+    var checkbox = document.getElementById('comment-reply');
+
+    // Clear the current label but NOT our checkbox!
+    var label = document.getElementById('comment-reply-label');
+    for(var i = 1; i < label.childNodes.length; i++) {
+        label.removeChild(label.childNodes[i]);
+    }
+    
+    // Populate label with new values
+    var reply_text = document.createTextNode(' <__trans phrase="Replying to"> ');
+    label.appendChild(reply_text);
+
+    var anchor = document.createElement('a');
+    anchor.setAttribute('href', '#comment-' + parent_id);
+    anchor.innerHTML = author;
+    label.appendChild(anchor);
+    
+    checkbox.value = parent_id; 
+    checkbox.setAttribute('checked', true);
+    checkbox.focus();
+    
+    setCommentParentID();
+}
+
+function setCommentParentID() {
+    var checkbox = document.getElementById('comment-reply');
+    var parent_id_field = document.getElementById('comment-parent-id');
+    var pid = 0;
+    
+    if(checkbox.checked == true)
+        pid = checkbox.value;
+    
+    parent_id_field.value = pid;
+}
+
 
 // Copyright (c) 1996-1997 Athenia Associates.