diff --git a/src/templates/search/preview-search.html b/src/templates/search/preview-search.html
index 179ccf1..b83f4e4 100644
--- a/src/templates/search/preview-search.html
+++ b/src/templates/search/preview-search.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load highlight %}
 
+<li class="preview-message">
 <span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span>
 
 {% if result.mailinglist_url %}
@@ -29,3 +30,21 @@
       <!-- a striptags filter was raising an error here because using with highlight -->
   <span class="quiet">- {% highlight result.description with query max_length "150" %}</span>
 {% endif %}
+
+{% if result.author or result.modified %}
+  <div class="quiet">
+    {% if result.author %}
+      <span class="pull-left">{% trans "by" %}
+        {% if result.author and result.author_url %}
+          <a href="{{ result.author_url }}">{% highlight result.author with query %}</a>
+        {% else %}
+          <span>{{ result.author }}</span>
+        {% endif %}
+      </span>
+    {% endif %}
+    {% if result.modified %}
+    <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span>
+    {% endif %}
+  </div>
+{% endif %}
+</li>
diff --git a/src/templates/search/search.html b/src/templates/search/search.html
index 160b26c..f51607e 100644
--- a/src/templates/search/search.html
+++ b/src/templates/search/search.html
@@ -48,22 +48,7 @@
     <div class="col-lg-10">
       <ul class="none indent list-unstyled">
       {% for result in page.object_list  %}
-        <li class="preview-message">
-          {% include "search/preview-search.html" %}
-
-          {% if result.author %}
-            <div class="quiet">
-              <span class="pull-left">{% trans "by" %}
-                {% if result.author and result.author_url %}
-                  <a href="{{ result.author_url }}">{% highlight result.author with query %}</a>
-                {% else %}
-                  <span>{{ result.author }}</span>
-                {% endif %}
-              </span>
-              <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span>
-            </div>
-          {% endif %}
-        </li>
+        {% include "search/preview-search.html" %}
       {% empty %}
         <li class="text-center">
           {% trans "No results for your search." %}
--
libgit2 0.21.2