added first pass timestamp logic for messages