Merge "Fix vCard so that it looks at IM correctly." into gingerbread