MOB-2462 messages moved to singleton