moved more of email block into BunchZeroListener