Changed method of setting email message