initial code for multi-tenant, some mailbox fixes
Merge pull request #24 from cd34/master

initial code for multi-tenant, some mailbox fixes