diff --git a/admin/models.py b/admin/models.py
index e75ae0898..c405704b0 100644
--- a/admin/models.py
+++ b/admin/models.py
@@ -408,10 +408,10 @@ class Mailbox(DatesAware):
 
     def __str__(self):
         return self.__full_address()
-
-    def __full_address(self):
+	
+    @property
+    def full_address(self):
         return "%s@%s" % (self.address, self.domain.name)
-    full_address = property(__full_address)
 
     def __enabled(self):
         return self.user.is_active
diff --git a/admin/tables.py b/admin/tables.py
index bcd15cd2a..6c8a27120 100644
--- a/admin/tables.py
+++ b/admin/tables.py
@@ -67,7 +67,7 @@ class MailboxesTable(tables.Table):
     tableid = "objects_table"
     idkey = "id"
 
-    address = tables.Column("address", label=ugettext_noop("Address"))
+    address = tables.Column("full_address", label=ugettext_noop("Address"))
     name = tables.Column("user", label=ugettext_noop("Name"))
     creation = tables.Column("creation", label=ugettext_noop("Created"), 
                              width="160px")