Minor change to mail settings maintenance to save flags to mail correctly.
Prepared for gold extension to be installed and work.