Messaging fully working in production