fixes #66
Merge branch 'master' of github.com:lsuits/quickmail