rewrite the account deactivation code to make sure it works with mailboxes and restores properly