Fix some Echo-related messages

It seems some changes have been made to how these messages are used in Echo
They are now phrased differently and can be used for enabling/disabling web notifications as well
as email notifications.

Change-Id: Iac6d60b3de463a904f1b04aa46027a74c662a981
Merge "Fix some Echo-related messages"