Refactor to remove read? column from messages