diff --git a/src/super_archives/search_indexes.py b/src/super_archives/search_indexes.py
index 3a5e65b..370cece 100644
--- a/src/super_archives/search_indexes.py
+++ b/src/super_archives/search_indexes.py
@@ -25,6 +25,9 @@ class ThreadIndex(BaseIndex, indexes.Indexable):
         model_attr='mailinglist__get_absolute_url',
         indexed=False,
     )
+    latest_message_pk = indexes.IntegerField(
+        model_attr='latest_message__pk', indexed=False
+    )
     score = indexes.IntegerField(model_attr='score')
 
     def get_model(self):
diff --git a/src/super_archives/templates/message-preview.html b/src/super_archives/templates/message-preview.html
index fa01127..19d18be 100644
--- a/src/super_archives/templates/message-preview.html
+++ b/src/super_archives/templates/message-preview.html
@@ -10,7 +10,7 @@
 {% endif %}
 
 {% if result.title %}
-  <a href="{{ result.url }}" {% if result.latest_description %}title="{{ result.latest_description|escape|truncatechars:150 }}"{% elif result.description %}title="{{ result.description|escape|truncatechars:150 }}"{% endif %}>
+  <a href="{{ result.url }}{% if result.type == 'thread' and result.latest_message_pk %}#msg-{{ result.latest_message_pk }}{% elif result.type == 'thread' and result.pk %}#msg-{{ result.pk }}{% endif %}" {% if result.latest_description %}title="{{ result.latest_description|escape|truncatechars:150 }}"{% elif result.description %}title="{{ result.description|escape|truncatechars:150 }}"{% endif %}>
     <span class="subject">
       <!-- a striptags filter was raising an error here because using with highlight -->
       {% if query %}
--
libgit2 0.21.2