Restore Thomas' fixes, which the merge partially reverted.
Restore Thomas' fixes, which the merge partially reverted.

svn path=/trunk/KDE/kdepim/; revision=691851

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi