last part of Ingo's fixes
last part of Ingo's fixes

svn path=/trunk/kdenetwork/doc/kmail/; revision=134931

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