fix duplicating mail