Fixing email destinations