Fixed date mapping issue for message