Fix scenario with default identity and make logic more readable
Fix scenario with default identity and make logic more readable

svn path=/branches/kdepim/enterprise/kdepim/; revision=1027203

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