Prevent Mail deletion and minor homepage changes
Merging with TJ