Add link field to message notification form
Merge with origin/develop