safe_mail application fix
Merge branch 'master' of https://github.com/ajwerner/safe

Conflicts:
	safe_mail.py