Better bug fix in new email extraction routine