remove mailbox optimization because it breaks unit tests
remove mailbox optimization because it breaks unit tests

ChristophWurst/mail,kingjan1999/mail,ChristophWurst/mail,kingjan1999/mail,kingjan1999/mail,ChristophWurst/mail