Merge smimevalidationpreferences into settings
(cherry picked from commit 2234ab3148e8c6d9f8094ece34a74cebaa2c1965)