Hi Radek, Please would you consider the patch below? It's a minor IMAP sync optimization, or more precisely quite a significant optimization but for a scenario that I would guess is pretty rare. I've written more about it in the commit message. Regards, Neil