Started to add e-mail from: functionality.