Added data for mail timestamps
auto-merge staging into master