diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index ce0ad5e..4d764b7 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -113,12 +113,12 @@
   <div class="card-block">
 
     <section class="issue_comment">
-      <div class="comment_body">
+      <div>
         <span class="edit_date" title="{{
             comment.edited_on.strftime('%Y-%m-%d %H:%M:%S') if comment.edited_on
         }}">
         </span>
-        <span class="comment_text">
+        <span class="comment_text comment_body">
         {%- autoescape false %}
         {%- if id == 0 -%}
 {{ comment.content | markdown }}
@@ -169,13 +169,14 @@
 <div class="clearfix p-b-3">
     <section class="issue_comment" id="comment-0">
       <div class="comment_body">
-        {% autoescape false %}
-        {{ comment.content | markdown }}
-        {% endautoescape %}
+        {%- autoescape false -%}
+{{ comment.content | markdown }}
+        {%- endautoescape -%}
       </div>
     </section>
         <aside class="issue_action icon pull-xs-right">
-          <a class="btn btn-secondary btn-sm" title="Reply to this comment - loose formating">
+          <a class="btn btn-secondary btn-sm reply"
+            title="Reply to this comment - loose formating">
             reply
           </a>
       {% if repo_admin or (
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 930fd92..eb99985 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -279,12 +279,16 @@ function setup_reply_btns() {
   $(".reply").unbind();
   $( ".reply" ).click(
     function() {
-      var _section = $(this).parent().parent().parent();
+      if ($(this).attr('data-toggle')){
+        var _section = $(this).closest('.card-block');
+      } else {
+        var _section = $(this).closest('.clearfix');
+      }
       var _comment = _section.find('.comment_body');
       var _text = _comment.text().split("\n");
       var _output = new Array();
-      for (cnt = 0; cnt < _text.length - 1; cnt ++) {
-          _output[cnt] = '> ' + jQuery.trim(_text[cnt + 1]);
+      for (cnt = 0; cnt < _text.length ; cnt ++) {
+          _output[cnt] = '> ' + jQuery.trim(_text[cnt]);
       }
       $( "#comment" ).val(_output.join("\n"));
     }
@@ -318,9 +322,7 @@ $(document).ready(function() {
 
 });
 </script>
-    <script type="text/javascript">
 
-    </script>
 {% if config['EVENTSOURCE_SOURCE'] and not issue.private %}
 <script type="text/javascript"
   src="{{ url_for('static', filename='issue_ev.js') }}"></script>
@@ -400,7 +402,7 @@ function try_async_comment(form) {
 
 </script>
 {% endif %}
-<script>
+<script type="text/javascript">
 $( document ).ready(function() {
   var emojiStrategy;
   $.getJSON(