diff --git a/src/super_archives/templates/message-preview.html b/src/super_archives/templates/message-preview.html
index 6eee4c2..6891d06 100644
--- a/src/super_archives/templates/message-preview.html
+++ b/src/super_archives/templates/message-preview.html
@@ -41,19 +41,19 @@
     {% if result.fullname or result.modified_by %}
       <span class="pull-left">{% trans "by" %}
         {% if result.modified_by and result.modified_by_url %}
-          <a href="{{ result.author_url }}">
+          <a href="{{ result.modified_by_url }}">
             {% if query %}
-              {% highlight result.fullname with query %}
+              {% highlight result.modified_by with query %}
             {% else %}
-              {{ result.fullname }}
+              {{ result.modified_by }}
             {% endif %}
           </a>
         {% elif result.fullname and result.author_url %}
-          <a href="{{ result.modified_by_url }}">
+          <a href="{{ result.author_url }}">
             {% if query %}
-              {% highlight result.modified_by with query %}
+              {% highlight result.fullname with query %}
             {% else %}
-              {{ result.modified_by }}
+              {{ result.fullname }}
             {% endif %}
           </a>
         {% else %}
--
libgit2 0.21.2