MYLOC-59 - Moving message into message module