diff --git a/class.phpmailer.php b/class.phpmailer.php
index f22a05cd3..769fe6d17 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -3007,6 +3007,8 @@ public static function _mime_types($ext = '')
             'txt' => 'text/plain',
             'rtx' => 'text/richtext',
             'rtf' => 'text/rtf',
+            'vcf' => 'text/vcard',
+            'vcard' => 'text/vcard',
             'xml' => 'text/xml',
             'xsl' => 'text/xml',
             'mpeg' => 'video/mpeg',
diff --git a/examples/gmail.phps b/examples/gmail.phps
index f39a30344..a6d419887 100644
--- a/examples/gmail.phps
+++ b/examples/gmail.phps
@@ -15,40 +15,56 @@ require '../PHPMailerAutoload.php';
 
 //Create a new PHPMailer instance
 $mail = new PHPMailer();
+
 //Tell PHPMailer to use SMTP
 $mail->isSMTP();
+
 //Enable SMTP debugging
 // 0 = off (for production use)
 // 1 = client messages
 // 2 = client and server messages
 $mail->SMTPDebug = 2;
+
 //Ask for HTML-friendly debug output
 $mail->Debugoutput = 'html';
+
 //Set the hostname of the mail server
 $mail->Host = 'smtp.gmail.com';
+
 //Set the SMTP port number - 587 for authenticated TLS, a.k.a. RFC4409 SMTP submission
 $mail->Port = 587;
+
 //Set the encryption system to use - ssl (deprecated) or tls
 $mail->SMTPSecure = 'tls';
+
 //Whether to use SMTP authentication
 $mail->SMTPAuth = true;
+
 //Username to use for SMTP authentication - use full email address for gmail
 $mail->Username = "username@gmail.com";
+
 //Password to use for SMTP authentication
 $mail->Password = "yourpassword";
+
 //Set who the message is to be sent from
 $mail->setFrom('from@example.com', 'First Last');
+
 //Set an alternative reply-to address
 $mail->addReplyTo('replyto@example.com', 'First Last');
+
 //Set who the message is to be sent to
 $mail->addAddress('whoto@example.com', 'John Doe');
+
 //Set the subject line
 $mail->Subject = 'PHPMailer GMail SMTP test';
+
 //Read an HTML message body from an external file, convert referenced images to embedded,
 //convert HTML into a basic plain-text alternative body
 $mail->msgHTML(file_get_contents('contents.html'), dirname(__FILE__));
+
 //Replace the plain text body with one created manually
 $mail->AltBody = 'This is a plain-text message body';
+
 //Attach an image file
 $mail->addAttachment('images/phpmailer_mini.png');