Ask for vCard if we don't have it. close #599
Code cleanup