Fixing grammar for submillisecond times. #418
Fixed wrong message id being refreshed after retry. #419