Why not just switch to imap?
Isn't pop the problem (instead of upas/fs)?