nmbryant Moves the save email button in the preferences panel
Merges preferencesGUIFixes into dev