diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index e9767a6c8..5909928b2 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -1,6 +1,6 @@
 /* NGVCard+SOGo.m - this file is part of SOGo
  *
- * Copyright (C) 2009-2016 Inverse inc.
+ * Copyright (C) 2009-2017 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
  */
 
 
+#import <Foundation/NSValue.h>
 #import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NGBase64Coding.h>
@@ -1032,6 +1033,11 @@ convention:
     [fields setObject: [NSNull null] forKey: @"c_categories"];
   [fields setObject: @"vcard" forKey: @"c_component"];
 
+  // S/MIME certificate
+  element = [self uniqueChildWithTag: @"key"];
+  [fields setObject: [NSNumber numberWithInt: (element && ![element isVoid])]
+             forKey: @"c_hascertificate"];
+
   return fields;
 }
 
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 927b55ad1..bcbe2c70b 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2016 Inverse inc.
+  Copyright (C) 2006-2017 Inverse inc.
 
   This file is part of SOGo.
 
@@ -58,7 +58,8 @@ static NSArray *folderListingFields = nil;
                                            @"c_screenname", @"c_o",
                                            @"c_mail", @"c_telephonenumber",
                                            @"c_categories",
-                                           @"c_component", nil];
+                                           @"c_component",
+                                           @"c_hascertificate", nil];
 }
 
 - (id) init