diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index e1b4498d7..b0cd0e90d 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1332,6 +1332,9 @@ public class MessageList
         public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY)
         {
 
+            if (e2 == null || e1 == null) 
+                return true;
+
             float deltaX = e2.getX() - e1.getX(),
                            deltaY = e2.getY() - e1.getY();