reorder arguments for CPG on_message callback

This is to make it consistent, sender should always be first in everything