Backport revisions 1098941 and 1098945 CCBUG: 226984
svn path=/branches/KDE/4.4/kdepimlibs/; revision=1119520