More Admin->Mail GUI and functionality fixes.