Imporve imap and smtp
Merge pull request #4 from TiffanyZhou/imap

Imporve imap and smtp