Bug 928918 -Follow up to Bug 914999 The phone of a contact exported to vCard does not appear when it has certain mobile type assigned
Merge pull request #13033 from gitmai/bug-928918-export-vcard-phonenumber

Bug 928918 -Follow up to Bug 914999 The phone of a contact exported to vCard does not appear when it has certain mobile type assigned
Bug 911934 - Honor the expiration date if present in a message r=julienw