Email fixing