Remove code related to actionmailer version not supported anymore
Use a better name for variable
Fix bug in original repo: https://github.com/myronmarston/mail_safe/issues/7
tidy