some modifications in emails