This fixes one part (the contact list covering) of #1582 (closed).
This will create a new commit in order to revert the existing changes.
