Fixing mailer.
Merge branch 'release-0.3'