diff --git a/src/super_archives/models.py b/src/super_archives/models.py
index 82089a1..6e4c35d 100644
--- a/src/super_archives/models.py
+++ b/src/super_archives/models.py
@@ -334,6 +334,16 @@ class Message(models.Model):
             return self.from_address.user.get_absolute_url()
         return None
 
+    # An alias for author
+    @property
+    def modified_by(self):
+        return self.author
+
+    # An alias for author_url
+    @property
+    def modified_by_url(self):
+        return self.author_url
+
     @property
     def fullname(self):
         return self.from_address.get_full_name()
diff --git a/src/super_archives/templates/message-preview.html b/src/super_archives/templates/message-preview.html
index f875a68..6eee4c2 100644
--- a/src/super_archives/templates/message-preview.html
+++ b/src/super_archives/templates/message-preview.html
@@ -40,20 +40,28 @@
   <div class="quiet">
     {% if result.fullname or result.modified_by %}
       <span class="pull-left">{% trans "by" %}
-        {% if result.fullname and result.author_url or result.modified_by and result.modified_by_url %}
-          <a href="{% firstof result.modified_by_url result.author_url %}">
+        {% if result.modified_by and result.modified_by_url %}
+          <a href="{{ result.author_url }}">
             {% if query %}
-              {% if result.modified_by %}
-                {% highlight result.modified_by with query %}
-              {% else %}
-                {% highlight result.fullname with query %}
-              {% endif %}
+              {% highlight result.fullname with query %}
             {% else %}
-              {% firstof result.modified_by result.fullname %}
+              {{ result.fullname }}
+            {% endif %}
+          </a>
+        {% elif result.fullname and result.author_url %}
+          <a href="{{ result.modified_by_url }}">
+            {% if query %}
+              {% highlight result.modified_by with query %}
+            {% else %}
+              {{ result.modified_by }}
             {% endif %}
           </a>
         {% else %}
-          <span>{{ result.fullname }}</span>
+          {% if result.modified_by %}
+            <span>{{ result.modified_by }}</span>
+          {% else %}
+            <span>{{ result.fullname }}</span>
+          {% endif %}
         {% endif %}
       </span>
     {% else %}
--
libgit2 0.21.2