diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
index b69c549969..f5fcf1a190 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
@@ -239,6 +239,9 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement
 					error = ((ErrorMessage) reply).getPayload();
 				}
 			}
+			if (reply == null){
+				
+			}
 		}
 		catch (Exception e) {
 			logger.warn("failure occurred in gateway sendAndReceive", e);
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 1714d88e4c..2a8887e342 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
@@ -80,13 +80,11 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl
 	public AbstractMailReceiver(URLName urlName) {
 		Assert.notNull(urlName, "urlName must not be null");
 		this.url = urlName;
-		//this.shouldDeleteMessages = urlName.getProtocol().startsWith("pop3");
 	}
 
 	public AbstractMailReceiver(String url) {
 		if (url != null) {
 			this.url = new URLName(url);
-			//this.shouldDeleteMessages = this.url.getProtocol().startsWith("pop3");
 		}
 		else {
 			this.url = null;
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 b16d6ef677..c1c3840960 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
@@ -174,9 +174,8 @@ public class ImapMailReceiver extends AbstractMailReceiver {
 			}
 		}
 	}
-	/**
-	 * 
-	 */
+	
+	@Override
 	protected void onInit() throws Exception {
 		if (this.shouldMarkMessagesAsRead){
 			this.folderOpenMode = Folder.READ_WRITE;
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 d82e7e5b7c..e0da8d65d1 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
@@ -53,10 +53,8 @@ import com.sun.mail.imap.IMAPFolder;
  */
 public class ImapMailReceiverTests {
 	
-	
-	
 	@Test
-	public void receieveAndMarkAsReadDontDelete() throws Exception{
+	public void receiveAndMarkAsReadDontDelete() throws Exception{
 		AbstractMailReceiver receiver = new ImapMailReceiver();
 		((ImapMailReceiver)receiver).setShouldMarkMessagesAsRead(true);
 		receiver = spy(receiver);
@@ -93,7 +91,7 @@ public class ImapMailReceiverTests {
 		verify(receiver, times(0)).deleteMessages((Message[]) Mockito.any());
 	}
 	@Test
-	public void receieveMarkAsReadAndDelete() throws Exception{
+	public void receiveMarkAsReadAndDelete() throws Exception{
 		AbstractMailReceiver receiver = new ImapMailReceiver();
 		((ImapMailReceiver)receiver).setShouldMarkMessagesAsRead(true);
 		receiver.setShouldDeleteMessages(true);
@@ -130,7 +128,7 @@ public class ImapMailReceiverTests {
 		verify(receiver, times(1)).deleteMessages((Message[]) Mockito.any());
 	}
 	@Test
-	public void receieveAndDontMarkAsRead() throws Exception{
+	public void receiveAndDontMarkAsRead() throws Exception{
 		AbstractMailReceiver receiver = new ImapMailReceiver();
 		((ImapMailReceiver)receiver).setShouldMarkMessagesAsRead(false);
 		receiver = spy(receiver);
@@ -166,7 +164,7 @@ public class ImapMailReceiverTests {
 		verify(msg2, times(0)).setFlag(Flag.SEEN, true);
 	}
 	@Test
-	public void receieveAndDontMarkAsReadButDelete() throws Exception{
+	public void receiveAndDontMarkAsReadButDelete() throws Exception{
 		AbstractMailReceiver receiver = new Pop3MailReceiver();
 		((Pop3MailReceiver)receiver).setShouldDeleteMessages(true);
 		receiver = spy(receiver);
@@ -204,7 +202,7 @@ public class ImapMailReceiverTests {
 		verify(msg2, times(1)).setFlag(Flag.DELETED, true);
 	}
 	@Test
-	public void receieveAndIgnoreMarkAsReadDontDelete() throws Exception{
+	public void receiveAndIgnoreMarkAsReadDontDelete() throws Exception{
 		AbstractMailReceiver receiver = new ImapMailReceiver();
 		receiver = spy(receiver);
 		receiver.afterPropertiesSet();
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java
index 13061a8b7c..fed5f2b9ec 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java
@@ -38,7 +38,7 @@ import org.springframework.beans.DirectFieldAccessor;
  */
 public class Pop3MailReceiverTests {
 	@Test
-	public void receieveAndDelete() throws Exception{
+	public void receiveAndDelete() throws Exception{
 		AbstractMailReceiver receiver = new Pop3MailReceiver();
 		((Pop3MailReceiver)receiver).setShouldDeleteMessages(true);
 		receiver = spy(receiver);
@@ -74,7 +74,7 @@ public class Pop3MailReceiverTests {
 		verify(msg2, times(1)).setFlag(Flag.DELETED, true);
 	}
 	@Test
-	public void receieveAndDontDelete() throws Exception{
+	public void receiveAndDontDelete() throws Exception{
 		AbstractMailReceiver receiver = new Pop3MailReceiver();
 		((Pop3MailReceiver)receiver).setShouldDeleteMessages(false);
 		receiver = spy(receiver);
@@ -110,7 +110,7 @@ public class Pop3MailReceiverTests {
 		verify(msg2, times(0)).setFlag(Flag.DELETED, true);
 	}
 	@Test
-	public void receieveAndDontSetDeleteWithUrl() throws Exception{
+	public void receiveAndDontSetDeleteWithUrl() throws Exception{
 		AbstractMailReceiver receiver = new Pop3MailReceiver("pop3://some.host");
 		receiver = spy(receiver);
 		receiver.afterPropertiesSet();
@@ -145,7 +145,7 @@ public class Pop3MailReceiverTests {
 		verify(msg2, times(0)).setFlag(Flag.DELETED, true);
 	}
 	@Test
-	public void receieveAndDontSetDeleteWithoutUrl() throws Exception{
+	public void receiveAndDontSetDeleteWithoutUrl() throws Exception{
 		AbstractMailReceiver receiver = new Pop3MailReceiver();
 		receiver = spy(receiver);
 		receiver.afterPropertiesSet();