Get the app ready for CardDav support

Created by: mardy

Please review the two commits individually. The commit messages explain the changes.

Please don't squash the commits when merging. :-)