Adding missing mailbox import, issue #399