Hotfix/mail and rails version

Couple of quick fixes, see commits.