Conflicts: offlineimap/folder/IMAP.py offlineimap/imaputil.py Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>