Mail fixes #4