General mail control

@jdutil, have a look at this. Failed test do not seem to implicate these changes. I'm stumped by problems in views/spree/admin/suppliers/_form.html.erb so cannot test setup and modification of suppliers.