[Bug 548676] mail_settings vs. mailsettings name inconsistency