adding mail 6.1 support
Merge pull request #24 from MikeSilvis/add-mail-61-support

adding mail 6.1 support