diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java
index 4b7838225f..fb4102f4b6 100755
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 package org.springframework.integration.mail;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.concurrent.ScheduledFuture;
 
 import javax.mail.Flags;
@@ -51,6 +53,7 @@ import com.sun.mail.imap.IMAPMessage;
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  * @author Gary Russell
+ * @author Artem Bilan
  */
 public class ImapMailReceiver extends AbstractMailReceiver {
 
@@ -183,7 +186,7 @@ public class ImapMailReceiver extends AbstractMailReceiver {
 		SearchTerm searchTerm = this.compileSearchTerms(supportedFlags);
 		Folder folder = this.getFolder();
 		if (folder.isOpen()) {
-			Message[] messages = searchTerm != null ? folder.search(searchTerm) : folder.getMessages();
+			Message[] messages = nullSafeMessages(searchTerm != null ? folder.search(searchTerm) : folder.getMessages());
 			for (Message message : messages) {
 				((IMAPMessage) message).setPeek(true);
 			}
@@ -192,6 +195,28 @@ public class ImapMailReceiver extends AbstractMailReceiver {
 		throw new MessagingException("Folder is closed");
 	}
 
+	private Message[] nullSafeMessages(Message[] messageArray) {
+		boolean hasNulls = false;
+		for (Message message : messageArray) {
+			if (message == null) {
+				hasNulls = true;
+				break;
+			}
+		}
+		if (!hasNulls) {
+			return messageArray;
+		}
+		else {
+			List<Message> messages = new ArrayList<Message>();
+			for (Message message : messageArray) {
+				if (message != null) {
+					messages.add(message);
+				}
+			}
+			return messages.toArray(new Message[messages.size()]);
+		}
+	}
+
 	private SearchTerm compileSearchTerms(Flags supportedFlags) {
 		return this.searchTermStrategy.generateSearchTerm(supportedFlags, this.getFolder());
 	}
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
index 8f4cf33414..4c6c855370 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
@@ -864,6 +864,53 @@ public class ImapMailReceiverTests {
 		assertTrue(exec.isShutdown());
 	}
 
+	@Test
+	public void testNullMessages() throws Exception {
+		Message message1 = mock(Message.class);
+		Message message2 = mock(Message.class);
+		final Message[] messages1 = new Message[] { null, null, message1 };
+		final Message[] messages2 = new Message[] { message2 };
+		final SearchTermStrategy searchTermStrategy = mock(SearchTermStrategy.class);
+		class TestReceiver extends ImapMailReceiver {
+
+			private boolean firstDone;
+
+			public TestReceiver() {
+				setSearchTermStrategy(searchTermStrategy);
+			}
+
+			@Override
+			protected Folder getFolder() {
+				Folder folder = mock(Folder.class);
+				when(folder.isOpen()).thenReturn(true);
+				try {
+					when(folder.getMessages())
+							.thenReturn(!this.firstDone ? messages1 : messages2);
+				}
+				catch (MessagingException e) {
+				}
+				return folder;
+			}
+
+			@Override
+			public Message[] receive() throws MessagingException {
+				Message[] messages = searchForNewMessages();
+				this.firstDone = true;
+				return messages;
+			}
+
+
+		};
+		ImapMailReceiver receiver = new TestReceiver();
+		Message[] received = receiver.receive();
+		assertEquals(1, received.length);
+		assertSame(message1, received[0]);
+		received = receiver.receive();
+		assertEquals(1, received.length);
+		assertSame(messages2, received);
+		assertSame(message2, received[0]);
+	}
+
 	private void setUpScheduler(ImapMailReceiver mailReceiver, ThreadPoolTaskScheduler taskScheduler) {
 		taskScheduler.setPoolSize(5);
 		taskScheduler.initialize();