Reworked logic to actually fix issue526
Reworked logic to actually fix issue526

svn path=/branches/proko2/kdepim/; revision=365838

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