Changes related to mail 3
Merge branch 'master' of https://github.com/befreeit/simplifiedtax into siddhesh