PV 79 Minor amendments to messaging + fix for message url sent in emails