Fix build for actionmailer4.1
Clean code for current supported scenarios
Merge branch 'master' of github.com:watu/mail_safe