From 532db268ed0d5e670497921bc0090326bfc43987 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 24 Dec 2019 18:00:08 +0100
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 24b9de0568..f14d060e01 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -432,17 +432,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         if (message == null)
                             return;
 
-                        if (ibExpander.getVisibility() == View.VISIBLE) {
+                        if (ibExpander != null && ibExpander.getVisibility() == View.VISIBLE) {
                             boolean expanded = properties.getValue("expanded", message.id);
                             info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibExpander,
                                     context.getString(expanded ? R.string.title_accessibility_collapse : R.string.title_accessibility_expand)));
                         }
 
-                        if (ibAvatar.getVisibility() == View.VISIBLE && ibAvatar.isEnabled())
+                        if (ibAvatar != null && ibAvatar.getVisibility() == View.VISIBLE && ibAvatar.isEnabled())
                             info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibAvatar,
                                     context.getString(R.string.title_accessibility_view_contact)));
 
-                        if (ibFlagged.getVisibility() == View.VISIBLE && ibFlagged.isEnabled()) {
+                        if (ibFlagged != null && ibFlagged.getVisibility() == View.VISIBLE && ibFlagged.isEnabled()) {
                             int flagged = (message.count - message.unflagged);
                             info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibFlagged,
                                     context.getString(flagged > 0 ? R.string.title_unflag : R.string.title_flag)));