diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.h b/UI/MailPartViewers/UIxMailPartSignedViewer.h
index ec7e93e6e..b9f8e2585 100644
--- a/UI/MailPartViewers/UIxMailPartSignedViewer.h
+++ b/UI/MailPartViewers/UIxMailPartSignedViewer.h
@@ -1,6 +1,6 @@
 /* UIxMailPartSignedViewer.h - this file is part of SOGo
  *
- * Copyright (C) 2009-2018 Inverse inc.
+ * Copyright (C) 2009-2021 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
@@ -38,7 +38,8 @@
 - (NSString *) validationMessage;
 - (NSArray *) smimeCertificates;
 - (NSDictionary *) certificateForSubject: (NSString *) subject
-                               andIssuer: (NSString *) issuer;
+                               andIssuer: (NSString *) issuer
+                              withEmails: (NSArray *) emails;
 
 @end
 
diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m
index 6347040be..0818c426b 100644
--- a/UI/MailPartViewers/UIxMailPartSignedViewer.m
+++ b/UI/MailPartViewers/UIxMailPartSignedViewer.m
@@ -159,7 +159,8 @@
 	      BIO_free(buf);
 
               [certificates addObject: [self certificateForSubject: subject
-                                                         andIssuer: issuer]];
+                                                         andIssuer: issuer
+                                                        withEmails: emails]];
 	    }
 	}
       
@@ -240,10 +241,12 @@
 
 - (NSDictionary *) certificateForSubject: (NSString *) subject
                                andIssuer: (NSString *) issuer
+                              withEmails: (NSArray *) emails
 {
   return [NSDictionary dictionaryWithObjectsAndKeys:
-                              [subject componentsFromMultilineDN], @"subject",
-                              [issuer componentsFromMultilineDN], @"issuer",
+                         [subject componentsFromMultilineDN], @"subject",
+                         [issuer componentsFromMultilineDN], @"issuer",
+                         emails, @"emails",
                        nil];
 }
 
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 41281015d..dfe824ab9 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -275,6 +275,13 @@
               <div class="md-margin" md-whiteframe="3">
                 <div class="md-padding" layout="row" layout-wrap="layout-wrap">
                   <div flex="50" flex-xs="100">
+                    <div class="sg-padded--bottom" ng-if="::viewer.message.signed.certificate.emails">
+                      <div class="md-subhead md-default-theme md-fg md-primary"
+                           ng-bind="::'Email Addresses' | loc"><!-- Subject Name --></div>
+                      <div class="pseudo-input-field md-body-1"
+                           ng-repeat="email in ::viewer.message.signed.certificate.emails"
+                           ng-bind="email"><!-- email address --></div>
+                    </div>
                     <div class="md-subhead md-default-theme md-fg md-primary"
                         ng-bind="::'Subject Name' | loc"><!-- Subject Name --></div>
                     <div ng-repeat="field in ::viewer.message.signed.certificate.subject">