Fix timestamp bug in BasicMessage