Minor Fixes the the Mail helper