Add timeout
Fix timeout problem and update JavaMail version
Merge branch 'master' of github.com:abdollahpour/xweb-mail