Move mail intercept back to me
Use config setting for website

A number of mailing message have the website included. Generalize these.