move deadLetterMailbox into Mailboxes and fix review comments, see #3342