diff --git a/api/src/Mail.php b/api/src/Mail.php
index a5b4c5b4c0..bdd1e29b2b 100644
--- a/api/src/Mail.php
+++ b/api/src/Mail.php
@@ -7391,6 +7391,7 @@ class Mail
 			$metadata = array_merge ($metadata, array (
 				'verify'		=> $cert->verify,
 				'cert'			=> $cert->cert,
+				'certDetails'	=> $this->smime->parseCert($cert->cert),
 				'msg'			=> $cert->msg,
 				'certHtml'		=> $this->smime->certToHTML($cert->cert),
 				'email'			=> $cert->email,
diff --git a/mail/templates/default/smimeCertAddToContact.xet b/mail/templates/default/smimeCertAddToContact.xet
index f29b131f89..58595e677b 100644
--- a/mail/templates/default/smimeCertAddToContact.xet
+++ b/mail/templates/default/smimeCertAddToContact.xet
@@ -18,11 +18,20 @@
 					<description id="message2"/>
 				</row>
 				<row>
-					<description value="Certificate Info" label="%s:"/>
+					<description value="Signed by" label="%s:"/>
+					<description id="certDetails[subject][commonName]"/>
 				</row>
 				<row>
-					<description value="Signer's email" label="%s:"/>
-					<description id="email"/>
+					<description value="Email address" label="%s:"/>
+					<description id="certDetails[subject][emailAddress]"/>
+				</row>
+				<row>
+					<description value="Country" label="%s:"/>
+					<description id="certDetails[subject][countryName]"/>
+				</row>
+				<row>
+					<description value="Certificate issued by" label="%s:"/>
+					<description id="certDetails[issuer][commonName]"/>
 				</row>
 				<row>
 					<tabbox id="tabs" class="et2_nowrap" width="100%" span="all" tab_height="200" align_tabs="v">