Refact Account, return mailbox and fix
Refact Extension