3 files changed, 5 insertions, 3 deletions
diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index bcced23351..f2ab3cc179 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -66,7 +66,8 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension,
 {
 	EMailPartVCardInline *vcard_part;
 
-	g_return_val_if_fail (E_MAIL_PART_IS (part, EMailPartVCardInline), FALSE);
+	g_return_val_if_fail (E_IS_MAIL_PART_VCARD (part), FALSE);
+
 	vcard_part = (EMailPartVCardInline *) part;
 
 	if (context->mode == E_MAIL_FORMATTER_MODE_RAW)  {
diff --git a/modules/vcard-inline/e-mail-part-vcard-inline.h b/modules/vcard-inline/e-mail-part-vcard-inline.h
index 8272d2f672..b74dd76d1d 100644
--- a/modules/vcard-inline/e-mail-part-vcard-inline.h
+++ b/modules/vcard-inline/e-mail-part-vcard-inline.h
@@ -24,6 +24,9 @@
 #include <addressbook/gui/widgets/eab-contact-formatter.h>
 #include <webkit/webkitdom.h>
 
+#define E_IS_MAIL_PART_VCARD(part) \
+	(E_MAIL_PART_IS (part, EMailPartVCardInline))
+
 G_BEGIN_DECLS
 
 typedef struct _EMailPartVCardInline EMailPartVCardInline;
diff --git a/modules/vcard-inline/evolution-module-vcard-inline.c b/modules/vcard-inline/evolution-module-vcard-inline.c
index 4e95aba312..bb1196e865 100644
--- a/modules/vcard-inline/evolution-module-vcard-inline.c
+++ b/modules/vcard-inline/evolution-module-vcard-inline.c
@@ -28,8 +28,6 @@ const gchar * g_module_check_init (GModule *module);
 G_MODULE_EXPORT void
 e_module_load (GTypeModule *type_module)
 {
-	/* Register dynamically loaded types. */
-
 	e_mail_formatter_vcard_inline_type_register (type_module);
 	e_mail_parser_vcard_inline_type_register (type_module);
 }