Don can also fix some of the stuff he broke
Don can also fix some of the stuff he broke

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

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