[Mail] Fix commented out code