diff --git a/src/accounts/models.py b/src/accounts/models.py
index f5effec..9416823 100644
--- a/src/accounts/models.py
+++ b/src/accounts/models.py
@@ -2,6 +2,8 @@
 from django.db import models
 from django.contrib.auth.models import AbstractUser
 
+from django.core.urlresolvers import reverse
+
 
 class User(AbstractUser):
     institution = models.CharField(max_length=128, null=True, blank=True)
@@ -12,6 +14,9 @@ class User(AbstractUser):
     webpage = models.CharField(max_length=256, null=True, blank=True)
     verification_hash = models.CharField(max_length=32, null=True, blank=True)
 
+    def get_absolute_url(self):
+        return reverse('user_profile', kwargs={'username': self.username})
+
 # We need to have `email` field set as unique but Django does not
 #   support field overriding (at least not until 1.6).
 # The following workaroud allows to change email field to unique
diff --git a/src/super_archives/templates/message-preview.html b/src/super_archives/templates/message-preview.html
index 8b08327..7b457e9 100644
--- a/src/super_archives/templates/message-preview.html
+++ b/src/super_archives/templates/message-preview.html
@@ -33,13 +33,18 @@
 
   <div class="quiet">
     <span class="pull-left">
-      {% trans "by" %}
-																												      {% if doc.from_address.get_full_name %}
-      <a href="{{ doc.from_address.get_profile_link }}">
-        {{ doc.from_address.get_full_name }}
+      {% if doc.from_address.user.get_absolute_url or doc.from_address.get_full_name or doc.last_author or doc.Creator %}
+        {% trans "by" %}
+      {% endif %}
+
+      {% if doc.from_address.user.get_absolute_url %}
+      <a href="{{ doc.from_address.user.get_absolute_url }}">
+        {{ doc.from_address.user.get_full_name }}
       </a>
+      {% elif doc.from_address.get_full_name %}
+        <span>{{ doc.from_address.get_full_name }}</span>
       {% else %}
-        {% firstof doc.last_author doc.Creator _("anonymous") %}
+        {% firstof doc.last_author doc.Creator "" %}
       {% endif %}
     </span>
 
--
libgit2 0.21.2