Refactor SMTP.java
IMAP update
Refactor IMAP.java