diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 677b8a71ae..06e7e14771 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1182,7 +1182,11 @@ public class FragmentMessages extends FragmentBase {
             if (pos == RecyclerView.NO_POSITION)
                 return null;
 
-            TupleMessageEx message = ((AdapterMessage) rvMessage.getAdapter()).getCurrentList().get(pos);
+            PagedList<TupleMessageEx> list = ((AdapterMessage) rvMessage.getAdapter()).getCurrentList();
+            if (pos >= list.size())
+                return null;
+
+            TupleMessageEx message = list.get(pos);
             if (message == null || message.uid == null)
                 return null;