Minor changes to mail subscription template and views
Merge into master