Fix the lack of akonadiserver startup when kontact is restored by session management, and fix the lack of a mainwindow appearing at all in some other cases (kmailpart waiting for akonadi forever), as discussed with Volker. Obtained from: KDE svn A files (directory) A files/patch-1087778