Added new message sound and mute checkbox
fixing merge conflicts