Visibility of Inbox and Outbox corrected: They are now package-private.