Mail fixes #3