backport SVN commit 1021059 by winterz from trunk to e35:
backport SVN commit 1021059 by winterz from trunk to e35:

handle problems with editing in a more user-friendly way.

MERGE: e4

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

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