diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
index 1ba644a2a1..a85c0b51ec 100755
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
@@ -516,6 +516,9 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl
 		}
 
 		setMessageFlagsAndMaybeDeleteMessages(messages);
+		if (filteredMessages.length > 0 && filteredMessages[0] instanceof IntegrationMimeMessage) {
+			setMessageFlagsAndMaybeDeleteMessages(filteredMessages);
+		}
 	}
 
 	private void setMessageFlagsAndMaybeDeleteMessages(Message[] messages) throws MessagingException {
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 7f6bc7e057..375ae722ba 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
@@ -452,7 +452,7 @@ public class ImapMailReceiverTests {
 		assertThat(msg1.getFlags().contains(Flag.SEEN)).isTrue();
 		assertThat(msg2.getFlags().contains(Flag.SEEN)).isTrue();
 
-		verify(receiver, times(1)).deleteMessages(Mockito.any());
+		verify(receiver, times(2)).deleteMessages(Mockito.any());
 	}
 
 	@Test