forwardport 2nd half of fix for kolab issue688
forwardport 2nd half of fix for kolab issue688

svn path=/trunk/kdepim/; revision=398665

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