diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index c9648633e..547ff28a7 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -165,6 +165,11 @@
 			<artifactId>spring-context</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java
index fff227c71..cad5d38d3 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java
@@ -102,9 +102,9 @@ public class SimpleMailMessageItemWriter implements ItemWriter<SimpleMailMessage
 		}
 		catch (MailSendException e) {
 			@SuppressWarnings("unchecked")
-			Map<SimpleMailMessage, MessagingException> failedMessages = e.getFailedMessages();
-			for (Entry<SimpleMailMessage, MessagingException> entry : failedMessages.entrySet()) {
-				mailErrorHandler.handle(entry.getKey(), entry.getValue());
+			Map<Object, Exception> failedMessages = e.getFailedMessages();
+			for (Entry<Object, Exception> entry : failedMessages.entrySet()) {
+				mailErrorHandler.handle((SimpleMailMessage) entry.getKey(), (MessagingException) entry.getValue());
 			}
 		}
 	}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java
index d0b9822a6..00e3e3ca1 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java
@@ -106,9 +106,9 @@ public class MimeMessageItemWriter implements ItemWriter<MimeMessage> {
 		}
 		catch (MailSendException e) {
 			@SuppressWarnings("unchecked")
-			Map<MimeMessage, MessagingException> failedMessages = e.getFailedMessages();
-			for (Entry<MimeMessage, MessagingException> entry : failedMessages.entrySet()) {
-				mailErrorHandler.handle(new MimeMailMessage(entry.getKey()), entry.getValue());
+			Map<Object, Exception> failedMessages = e.getFailedMessages();
+			for (Entry<Object, Exception> entry : failedMessages.entrySet()) {
+				mailErrorHandler.handle(new MimeMailMessage((MimeMessage)entry.getKey()), (MessagingException)entry.getValue());
 			}
 		}
 	}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java
index 029232bfb..726957e47 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java
@@ -75,7 +75,7 @@ public class SimpleMailMessageItemWriterTests {
 
 		mailSender.send(EasyMock.aryEq(items));
 		EasyMock.expectLastCall().andThrow(
-				new MailSendException(Collections.singletonMap(foo, new MessagingException("FOO"))));
+				new MailSendException(Collections.singletonMap((Object)foo, (Exception)new MessagingException("FOO"))));
 		EasyMock.replay(mailSender);
 
 		writer.write(Arrays.asList(items));
@@ -100,7 +100,7 @@ public class SimpleMailMessageItemWriterTests {
 
 		mailSender.send(EasyMock.aryEq(items));
 		EasyMock.expectLastCall().andThrow(
-				new MailSendException(Collections.singletonMap(foo, new MessagingException("FOO"))));
+				new MailSendException(Collections.singletonMap((Object)foo, (Exception)new MessagingException("FOO"))));
 		EasyMock.replay(mailSender);
 
 		writer.write(Arrays.asList(items));
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java
index dfef86c5b..53e21e502 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java
@@ -80,7 +80,7 @@ public class MimeMessageItemWriterTests {
 
 		mailSender.send(EasyMock.aryEq(items));
 		EasyMock.expectLastCall().andThrow(
-				new MailSendException(Collections.singletonMap(foo, new MessagingException("FOO"))));
+				new MailSendException(Collections.singletonMap((Object)foo, (Exception)new MessagingException("FOO"))));
 		EasyMock.replay(mailSender);
 
 		writer.write(Arrays.asList(items));
@@ -105,7 +105,7 @@ public class MimeMessageItemWriterTests {
 
 		mailSender.send(EasyMock.aryEq(items));
 		EasyMock.expectLastCall().andThrow(
-				new MailSendException(Collections.singletonMap(foo, new MessagingException("FOO"))));
+				new MailSendException(Collections.singletonMap((Object)foo, (Exception) new MessagingException("FOO"))));
 		EasyMock.replay(mailSender);
 
 		writer.write(Arrays.asList(items));