Modified default mail sorting
Removed files from cache from tracking