Mail fixes + more