Email Fix up