added messaging (without Push notifications yet)