diff --git a/src/super_archives/models.py b/src/super_archives/models.py
index f27a700..82089a1 100644
--- a/src/super_archives/models.py
+++ b/src/super_archives/models.py
@@ -326,10 +326,7 @@ class Message(models.Model):
 
     @property
     def author(self):
-        from_address = self.from_address
-        if from_address.user:
-            return from_address.user.username
-        return None
+        return self.fullname
 
     @property
     def author_url(self):
@@ -338,6 +335,10 @@ class Message(models.Model):
         return None
 
     @property
+    def fullname(self):
+        return self.from_address.get_full_name()
+
+    @property
     def icon_name(self):
         return u'envelope'
 
--
libgit2 0.21.2