added cID and timestamp to Message and -raw export