Mail fixes #2