diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
index 59f7dd8fe..0ebbe923a 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
@@ -241,6 +241,10 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
     public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
 
+        if (isFinishing()) {
+            return;
+        }
+
         setIntent(intent);
 
         if (mFirstBackStackId >= 0) {