LPS-33747
LPS-33747 Rename - String messagId is confusing as it's different than the long message.getMessageId()
LPS-33747 Source formatting - use category.isRoot()
LPS-33747 Source formatting
LPS-33747 Sort