Use new Message.timestamp field directly