diff --git a/django_mailbox/models.py b/django_mailbox/models.py
index c623cdf..a27b5b2 100644
--- a/django_mailbox/models.py
+++ b/django_mailbox/models.py
@@ -881,7 +881,9 @@ class MessageAttachment(models.Model):
         return value
 
     def __str__(self):
-        return f'{self.message}: {self.document.url if self.document else None}'
+        if self.document:
+            return f'{self.get_filename()}: {self.document.url}'
+        return self.get_filename()
 
 
     class Meta: