Fix bug with expanding all emails