taking over the solution as found in the branch
taking over the solution as found in the branch

svn path=/trunk/kdenetwork/kmail/; revision=180631

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