Fixed message sorting when multiple sources used