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 %}
+
{% if result.mailinglist_url %}
@@ -29,3 +30,21 @@
- {% highlight result.description with query max_length "150" %}
{% endif %}
+
+{% if result.author or result.modified %}
+
+ {% if result.author %}
+
{% trans "by" %}
+ {% if result.author and result.author_url %}
+ {% highlight result.author with query %}
+ {% else %}
+ {{ result.author }}
+ {% endif %}
+
+ {% endif %}
+ {% if result.modified %}
+
{{ result.modified|timesince }} {% trans "ago" %}
+ {% endif %}
+
+{% endif %}
+
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 @@
{% for result in page.object_list %}
- -
- {% include "search/preview-search.html" %}
-
- {% if result.author %}
-
-
{% trans "by" %}
- {% if result.author and result.author_url %}
- {% highlight result.author with query %}
- {% else %}
- {{ result.author }}
- {% endif %}
-
-
{{ result.modified|timesince }} {% trans "ago" %}
-
- {% endif %}
-
+ {% include "search/preview-search.html" %}
{% empty %}
-
{% trans "No results for your search." %}
--
libgit2 0.21.2