diff --git a/src/templates/search/search-message-preview.html b/src/templates/search/search-message-preview.html
index 18ad0d0..e449429 100644
--- a/src/templates/search/search-message-preview.html
+++ b/src/templates/search/search-message-preview.html
@@ -1,43 +1,18 @@
 {% load i18n %}
 
-<li class="preview-message">
-  {% if result.Type %}
-    <img alt="{{ result.Type }}" title="{{ result.Type }}"
-      src="{{ STATIC_URL }}img/{{ result.Type }}.png" />
-  {% else %}
-    <span class="glyphicon glyphicon-envelope"></span>
-  {% endif %}
+<span class="glyphicon glyphicon-envelope" title="{{ result.type }}"></span>
 
-  {% if result.mailinglist %}
-    <a href="{% url 'super_archives.views.list_messages' %}?list={{ result.mailinglist }}">
-      <span class="label label-primary">{{ result.mailinglist }}</span>
-    </a>
-  {% endif %}
+{% if result.mailinglist %}
+  <a href="{% url 'super_archives.views.list_messages' %}?list={{ result.mailinglist }}">
+    <span class="label label-primary">{{ result.mailinglist }}</span>
+  </a>
+{% endif %}
 
-  <span class="subject">
-    <a href="{{ result.url }}#msg-{{ result.pk }}"
-      title="{% filter striptags|truncatewords:50 %}{{ result.description|escape }}{% endfilter %}">
-      {{ result.title }}
-    </a>
-  </span>
+<span class="subject">
+  <a href="{{ result.url }}#msg-{{ result.pk }}"
+    title="{% filter striptags|truncatewords:50 %}{{ result.description|escape }}{% endfilter %}">
+    {{ result.title }}
+  </a>
+</span>
 
-  <span class="quiet">- {{ result.description|striptags }}</span>
-
-  <div class="quiet">
-    <span class="pull-left">
-      {% if result.from_address_user_url or result.from_address_full_name or result.last_author or result.Creator %}
-        {% trans "by" %}
-      {% endif %}
-
-      {% if result.from_address_user_url %}
-        <a href="{{ result.from_address_user_url }}">{{ result.from_address_user_full_name }}</a>
-      {% elif result.from_address_full_name %}
-        <span>{{ result.from_address_full_name }}</span>
-      {% else %}
-        {% firstof result.last_author result.Creator "" %}
-      {% endif %}
-    </span>
-
-    <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span>
-  </div>
-</li>
+<span class="quiet">- {{ result.description|striptags }}</span>
diff --git a/src/templates/search/search-revision-preview.html b/src/templates/search/search-revision-preview.html
new file mode 100644
index 0000000..1f99c44
--- /dev/null
+++ b/src/templates/search/search-revision-preview.html
@@ -0,0 +1,9 @@
+{% load i18n %}
+
+<span class="glyphicon glyphicon-align-right" title="{{ result.type }}"></span>
+
+<span class="subject">
+  <a href="{{ result.url }}">{{ result.repository_name }} [{{ result.revision }}]</a>
+</span>
+
+<span class="quiet">{% if result.message %}- {{ result.message }}{% endif %}</span>
diff --git a/src/templates/search/search-ticket-preview.html b/src/templates/search/search-ticket-preview.html
new file mode 100644
index 0000000..e286b53
--- /dev/null
+++ b/src/templates/search/search-ticket-preview.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+
+<span class="glyphicon glyphicon-tag" title="{{ result.type }}"></span>
+
+<a href="{{ result.url }}" title="{{ result.description|escape }}">
+{% if result.status %}
+    <span class="label label-primary">{{ result.status }}</span>
+{% endif %}
+
+<span class="subject">
+    #{{ result.pk }} - {% filter striptags|truncatewords:50 %}{{ result.summary|escape }}{% endfilter %}
+  </a>
+</span>
+
+<span class="quiet">- {{ result.description|striptags|truncatechars:150 }}</span>
diff --git a/src/templates/search/search-user-preview.html b/src/templates/search/search-user-preview.html
index 8861878..cee56c5 100644
--- a/src/templates/search/search-user-preview.html
+++ b/src/templates/search/search-user-preview.html
@@ -1,11 +1,9 @@
 {% load i18n %}
 
-<li class="preview-message">
-  <span class="glyphicon glyphicon-user"></span>
+<span class="glyphicon glyphicon-user" title="{{ result.type }}"></span>
 
-  <span class="subject">
-    <a href="{% url 'user_profile' result.username %}">{{ result.name }}</a>
-  </span>
+<span class="subject">
+  <a href="{% url 'user_profile' result.username %}">{{ result.name }}</a>
+</span>
 
-  <span class="quiet">{% if result.institution %}- {{ result.institution }}{% endif %}{% if result.role %} - {{ result.role }}{% endif %}</span>
-</li>
+<span class="quiet">{% if result.institution %}- {{ result.institution }}{% endif %}{% if result.role %} - {{ result.role }}{% endif %}</span>
diff --git a/src/templates/search/search-wiki-preview.html b/src/templates/search/search-wiki-preview.html
index 141ea72..11fe25b 100644
--- a/src/templates/search/search-wiki-preview.html
+++ b/src/templates/search/search-wiki-preview.html
@@ -1,25 +1,9 @@
 {% load i18n %}
 
-<li class="preview-message">
-  <span class="glyphicon glyphicon-file"></span>
+<span class="glyphicon glyphicon-file" title="{{ result.type }}"></span>
 
-  <span class="subject">
-    <a href="{{ result.url }}">{{ result.name }}</a>
-  </span>
+<span class="subject">
+  <a href="{{ result.url }}">{{ result.name }}</a>
+</span>
 
-  <span class="quiet">{% if result.text %}- {{ result.text|truncatechars:150 }} {% endif %}{% if result.comment|truncatechars:150 %}- {{ result.comment }}{% endif %}</span>
-
-  <div class="quiet">
-    <span class="pull-left">
-      {% if result.author %}
-        {% trans "by" %}
-      {% endif %}
-
-      {% if result.author %}
-        <a href="{{ result.author_username }}">{{ result.author }}</a>
-      {% endif %}
-    </span>
-
-    <span class="pull-right">{{ result.time }} {% trans "ago" %}</span>
-  </div>
-</li>
+<span class="quiet">{% if result.wiki_text %}- {{ result.wiki_text|truncatechars:150 }}{% elif result.comment %}- {{ result.comment|truncatechars:150 }}{% endif %}</span>
--
libgit2 0.21.2