diff --git a/gnuviechadmin/managemails/models.py b/gnuviechadmin/managemails/models.py
index e24f65b..760551c 100644
--- a/gnuviechadmin/managemails/models.py
+++ b/gnuviechadmin/managemails/models.py
@@ -130,10 +130,12 @@ class Mailbox(ActivateAbleMixin, TimeStampedModel):
         self.password = sha512_crypt.encrypt(password)
 
     def save(self, *args, **kwargs):
+        # TODO: refactor to use signals
         create_file_mailbox.delay(self.osuser.username, self.username).get()
         super(Mailbox, self).save(*args, **kwargs)
 
     def delete(self, *args, **kwargs):
+        # TODO: refactor to use signals
         delete_file_mailbox.delay(self.osuser.username, self.username).get()
         super(Mailbox, self).delete(*args, **kwargs)