Email content + other changes