An update to mail broke some tests on Rails. Originally they were
unblocked here #31026 but Jeremy fixed them for Mail 2.7 in
0931e17e.

I wasn't able to cleanly backport this so I'm doing it manually. Fixes
the failing Rails 4.2 build on travis.