                 box.savePromised()
             .return account
 
-    .then (account) -> account.includeMailboxes()
+    .then (account) -> account.toObjectWithMailbox()
     .then (account) -> res.send account
     .catch next
 

        .then -> Mailbox.createPromised mailbox.toObject()
        .return account

    .then (account) -> account.includeMailboxes()
    .then (account) -> res.send account
    .catch (err) ->
        log.error err

            .then -> box.destroyAndRemoveAllMessages()
            .return account

    .then (account) -> account.toObjectWithMailbox()
    .then (account) -> res.send account
    .catch next
