Bug 657233 - Clean up "Calendar and Tasks" preferences in "General" and "Display"