smtp screen changes
Merge pull request #199 from Rakeshadlagatta/master

smtp screen changes