Fix an issue with inbox item dates
Merge