[Messages] Fixed caps etc for internal commonality as well as commonality
with messages_ng