diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index 32ba2733f..72ac618c6 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -2903,11 +2903,11 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
     }
 
     public boolean isFirst(MessageReference messageReference) {
-        return messageReference.equals(getReferenceForPosition(0));
+        return mAdapter.isEmpty() || messageReference.equals(getReferenceForPosition(0));
     }
 
     public boolean isLast(MessageReference messageReference) {
-        return messageReference.equals(getReferenceForPosition(mAdapter.getCount() - 1));
+        return mAdapter.isEmpty() || messageReference.equals(getReferenceForPosition(mAdapter.getCount() - 1));
     }
 
     private MessageReference getReferenceForPosition(int position) {