fix imap message count updates
remove commented code