From bc9112b5c1c18d75e9b2e11178f00c700ba3cc16 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 22 May 2020 12:35:48 +0200
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 133081170b..90c00c453a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -5523,7 +5523,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                     @Override
                                     public AttributeTable getSignedAttributes() {
                                         // The certificate validity will be check below
-                                        return super.getSignedAttributes().remove(CMSAttributes.signingTime);
+                                        AttributeTable at = super.getSignedAttributes();
+                                        return (at == null ? null : at.remove(CMSAttributes.signingTime));
                                     }
                                 };