Removed MailboxRelated stuff. Better mail in use check