Fixed issue #10 by dealing with mailbox options properly