Darrell, David, François,
I found that the first part of the commit c94de3af causes incorrect computation of unread messages in KMail - in the tray icon. Every time you switch to any folder, the number of unread messages is increased.
I could easily revert that part, but I fear that it will return a problem with gcc 4.7. You look at it? I do not know if a problem does not even rename "it" in the second part - for KOrganizer.
Slávek --