IMAP handler restructured
main template renamed
IMAP test