diff --git a/colab_spb/templates/discussion-message-preview.html b/colab_spb/templates/discussion-message-preview.html
index 9571892..663d53b 100644
--- a/colab_spb/templates/discussion-message-preview.html
+++ b/colab_spb/templates/discussion-message-preview.html
@@ -1,7 +1,6 @@
 {% load i18n tz highlight %}
 
 {% if result.fullname or result.modified or result.modified_by %}
-    <div class="message-discussion">
       <div class="quiet">
         {% if result.modified %}
           <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span>
@@ -31,7 +30,6 @@
           <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span>
         {% endif %}
       </div>
-  </div>
 {% endif %}
 
 {% if result.title %}
@@ -60,7 +58,6 @@
 
 {% if result.description %}
   <!-- a striptags filter was raising an error here because using with highlight -->
-  <div class="message-discussion">
       <span class="quiet"> - {% if query %}
         {% highlight result.description with query max_length "110" %}
       {% else %}
@@ -71,5 +68,4 @@
         {% endif %}
       {% endif %}
       </span>
-  <div>
 {% endif %}
diff --git a/colab_spb/templates/discussion.html b/colab_spb/templates/discussion.html
index 8017d7e..64d4e6c 100644
--- a/colab_spb/templates/discussion.html
+++ b/colab_spb/templates/discussion.html
@@ -1,11 +1,14 @@
   {% load i18n %}
   {% for listname, description, latest, most_relevant, number_of_users in lists %}
     {% if latest or most_relevant %}
+      <div id='discussions-content'>
       <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
           <h4>{% trans 'latest'|title %}</h4>
             {% for thread in latest %}
+    		<div class="message-discussion">
               {% include "discussion-message-preview.html" with result=thread.latest_message %}
+		</div>
             {% endfor %}
           <div class="text-right">
             <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread">
@@ -17,7 +20,9 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
           <h4>{% trans 'most relevant'|title %}</h4>
             {% for thread in most_relevant %}
+    		<div class="message-discussion">
               {% include "discussion-message-preview.html" with result=thread %}
+    		</div>
             {% endfor %}
           <div class="text-right">
             <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread">
@@ -26,5 +31,6 @@
           </div>
         </div>
       </div>
+      </div>
     {% endif %}
   {% endfor %}
--
libgit2 0.21.2