Add title and message_short attributes
Tweaks for new note email
Correct note subscription option label