Messages tables tidied up