diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
index f534374d25..23a4b5d191 100755
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
@@ -142,7 +142,12 @@ public class ImapIdleChannelAdapter extends MessageProducerSupport {
 						if (e instanceof FolderClosedException || 
 							e instanceof StoreClosedException || 
 							(e.getNextException() instanceof UnknownHostException && reconnecting)){
-							waitToReconnect();
+							try {
+								waitToReconnect();
+							} catch (InterruptedException e1) {
+								Thread.currentThread().interrupt();
+								return;
+							}
 							continue;
 						}
 					}