Manual Backport of #710

This is a manual backport of https://github.com/owncloud/contacts/pull/710

Cherry-pick or merge haven't worked for me (or i have done it wrong). 
Would be cool if someone approve or tell me how to do it right.