fix specs so that they work with mail v2.5.4
Merge pull request #12 from dwilkie/support_for_new_mail_gem

fix specs so that they work with mail v2.5.4