Fix time calculations for message