Fix the Mailbox view 2