diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 4c9af41d8..7d6e4ac8a 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -362,13 +362,13 @@ public class MessageList @Override public void run() { for (MessageInfoHolder message : messages) { - if (message != null) { - if (mFolderName == null || (message.folder != null && message.folder.name.equals(mFolderName))) { - if (message.selected && mSelectedCount > 0) { - mSelectedCount--; - } - mAdapter.messages.remove(message); + if (message != null && (mFolderName == null || ( + message.folder != null && + message.folder.name.equals(mFolderName)))) { + if (message.selected && mSelectedCount > 0) { + mSelectedCount--; } + mAdapter.messages.remove(message); } } resetUnreadCountOnThread();