Revert commit 943122. Breaks email ops.
svn path=/branches/kdepim/enterprise4/kdepim/; revision=943755