From 5a48fca43dc387033f53f6f99ac045eae1cf9604 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 1 Aug 2018 10:47:43 -0400
Subject: [PATCH] (fix) avoid displaying empty signed emails when using GNU TLS
 (fixes #4433)

---
 NEWS                                         | 1 +
 UI/MailPartViewers/UIxMailPartSignedViewer.m | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index c734e3bd9..e3c08055b 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Enhancements
 
 Bug fixes
  - [core] handle multi-valued mozillasecondemail attribute mapping
+ - [core] avoid displaying empty signed emails when using GNU TLS (#4433)
  - [web] improve popup window detection in message viewer (#4518)
 
 4.0.1 (2018-07-10)
diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m
index 009736b21..9f00ba9c1 100644
--- a/UI/MailPartViewers/UIxMailPartSignedViewer.m
+++ b/UI/MailPartViewers/UIxMailPartSignedViewer.m
@@ -170,8 +170,9 @@
       if (err)
         {
           ERR_load_crypto_strings();
+          SSL_load_error_strings();
           sslError = ERR_reason_error_string(err);
-          validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError]] retain];
+          validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : "(no error information available)"]] retain];
         }
     }