adjust the patch with the comments from Bugzilla,
see https://issues.kolab.org/show_bug.cgi?id=2491#c3