fixed email wrapper