diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
index dd72560ed..ace820b8c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
@@ -55,7 +55,7 @@ namespace Orchard.Comments.Controllers {
                     }
 
                     // is it a response to another comment ?
-                    if(commentPart.RepliedOn.HasValue && (commentsPart == null || !commentsPart.ThreadedComments)) {
+                    if(commentPart.RepliedOn.HasValue && commentsPart != null && commentsPart.ThreadedComments) {
                         var replied = Services.ContentManager.Get(commentPart.RepliedOn.Value);
                         if(replied != null) {
                             var repliedPart = replied.As<CommentPart>();
@@ -116,6 +116,10 @@ namespace Orchard.Comments.Controllers {
                 }
 
                 TempData["Comments.InvalidCommentEditorShape"] = editorShape;
+                var commentPart = comment.As<CommentPart>(); 
+                if(commentPart.RepliedOn.HasValue) {
+                    TempData["Comments.RepliedOn"] = commentPart.RepliedOn.Value;
+                }
             }
 
             return this.RedirectLocal(returnUrl, "~/");
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
index de1872e93..c6edaba15 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
@@ -2,7 +2,7 @@
 @foreach (var comment in Model.CommentShapes) {
     <li>
         @{
-            comment.Id = "comment-" + comment.ContentPart.Id;
+            comment.Id = "comment-" + comment.ContentItem.Id;
             var tag = Tag(comment, "article"); // using Tag so the comment can be altered by custom modules
             tag.AddCssClass("comment");
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml
index 32d038bce..75f111bae 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml
@@ -27,6 +27,7 @@ else if (WorkContext.CurrentUser == null && !AuthorizedFor(Permissions.AddCommen
 }
 else {
     @Html.ValidationSummary() 
+    <span id="comment-form-beacon" />
     using (Html.BeginFormAntiForgeryPost(Url.Action("Create", "Comment", new { Area = "Orchard.Comments", ReturnUrl = Context.Request.ToUrlString() }), FormMethod.Post, new { @class = "comment-form" })) {
         if (TempData.ContainsKey("Comments.InvalidCommentEditorShape")) {
             @Display(TempData["Comments.InvalidCommentEditorShape"]);
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.ListOfComments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.ListOfComments.cshtml
index bfa46e29e..22e21a8bc 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.ListOfComments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.ListOfComments.cshtml
@@ -1,29 +1,59 @@
-@if (Model.CommentCount > 0) {
+@using Orchard.Comments.Models
+@{
+    CommentsPart commentsPart = Model.ContentPart;
+}
+
+@if (Model.CommentCount > 0) {
     <div id="comments">
         <h2 class="comment-count">@T.Plural("1 Comment", "{0} Comments", (int)Model.CommentCount)</h2>
         @Display.ListOfComments(CommentShapes: Model.CommentShapes)
     </div>
 }
 
-@using(Script.Foot()) {
+@* render reply button if threaded comments enabled *@
+@if(commentsPart.ThreadedComments) {
     Script.Require("jQuery");
-    
+    using (Script.Foot()) {
+
 <script type="text/javascript">
 //<![CDATA[
-    $(function () {
-        $('.comment-reply-button').click(function () {
+    $(function() {
+        $('.comment-reply-button').click(function() {
             var self = $(this);
-            var id = self.data("id");
-            var reply = $('#Comments_RepliedOn');
-            reply.val(id);
 
-            // inject the form in the replied zone
-            $('.comment-form').appendTo(self.parents('article').first());
-            
-            // don't execute the link action
+            var reply = $('#Comments_RepliedOn');
+            var currentReply = reply.val();
+
+            @* should we restore the form at its original location ? *@
+            if (currentReply && currentReply.length > 0) {
+                reply.val('');
+                $('#comment-form-beacon').after($('.comment-form'));
+            } else {
+                @* assign repliedOn id *@
+                var id = self.data('id');
+                reply.val(id);
+
+                @* inject the form in the replied zone *@
+                $('.comment-form').appendTo(self.parents('article').first());
+            }
+
+            @* don't execute the link action *@
             return false;
         });
+
+
+        @if (TempData.ContainsKey("Comments.RepliedOn")) {
+            // invalid form while replying
+
+        <text>
+        var reply = $('#Comments_RepliedOn');
+        reply.val(@TempData["Comments.RepliedOn"]);
+        $('.comment-form').appendTo($('#comment-@TempData["Comments.RepliedOn"]'));
+        </text>
+        }
+
     });
 //]]>
 </script>
+ }
 }
\ No newline at end of file