Add additional sorting by message order