Imap and folders are now completly integrated