diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index dcad390565..d203e15637 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -1508,16 +1508,20 @@ body.discussion {
 
     }
 
-    p {
+    .response-body {
       font-size: 13px;
       padding: 10px 20px;
 
-      .posted-details {
-        font-size: 11px;
-        white-space: nowrap;
+      p + p {
+        margin-top: 12px;
       }
     }
 
+    .posted-details {
+      margin: 0 20px 10px;
+      font-size: 11px;
+    }
+
     .staff-label {
       margin-left: 2px;
       padding: 0 4px;
@@ -1529,10 +1533,6 @@ body.discussion {
       color: white;
       text-transform: uppercase;
     }
-
-    .posted-details {
-      margin-left: 8px;
-    }
   }
 
   .comment-form {
diff --git a/lms/templates/discussion/_single_thread.html b/lms/templates/discussion/_single_thread.html
index 0a952b857f..c7644dcbef 100644
--- a/lms/templates/discussion/_single_thread.html
+++ b/lms/templates/discussion/_single_thread.html
@@ -22,7 +22,7 @@
       <div class="response-body">${reply['body']}</div>
       <ol class="comments">
         % for comment in reply.get("children", []):
-        <li><p>${comment['body']}</p></li>
+        <li><div class="comment-body">${comment['body']}</div></li>
         % endfor
       </ol>
     </li>
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index f031883db7..240a7bab02 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -116,13 +116,15 @@
 </script>
 
 <script type="text/template" id="response-comment-show-template">
-  <p id="comment_${'<%- id %>'}">
+  <div id="comment_${'<%- id %>'}">
     ${'<% if (deep) {%>'}
     <a href="#comment_${'<%- parent_id %>'}">@${'<%- parent_username %>'}</a>:
     ${'<% }%>'}
-    <span class="response-body">${'<%- body %>'}</span>
-    <span class="posted-details">&ndash;posted <span class="timeago" title="${'<%- created_at %>'}">${'<%- created_at %>'}</span> by <a href="${'<%- user_url %>'}" class="profile-link">${'<%- username %>'}</a></span>
-  </p>
+    <div class="response-body">
+      ${'<%- body %>'}
+    </div>
+    <p class="posted-details">&ndash;posted <span class="timeago" title="${'<%- created_at %>'}">${'<%- created_at %>'}</span> by <a href="${'<%- user_url %>'}" class="profile-link">${'<%- username %>'}</a></p>
+  </div>
 </script>
 
 <script type="text/template" id="thread-list-item-template">