Fix mail and settings