diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath
index b3fa2c313c..869134428b 100644
--- a/org.springframework.integration.adapter/.classpath
+++ b/org.springframework.integration.adapter/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.0/com.springsource.javax.activation-1.1.0.jar" sourcepath="/IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.0/com.springsource.javax.activation-sources-1.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-1.4.1.jar" sourcepath="/IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-1.4.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-1.4.1.jar" sourcepath="/IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-sources-1.4.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderMapper.java
index fbbacb3e29..bb47448047 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderMapper.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderMapper.java
@@ -125,15 +125,15 @@ public abstract class AbstractMailHeaderMapper implements MessageHeaderMapper<Mi
 			message.setReplyTo(replyTo);
 		}
 	}
-	
+
 	public Map<String,Object> mapToMessageHeaders(MimeMessage mailMessage) {
 		try {
 			Map<String, Object> headers = new HashMap<String, Object>();
-			headers.put(MailAttributeKeys.FROM, toStringArray(mailMessage.getFrom()));
-			headers.put(MailAttributeKeys.BCC, toStringArray(mailMessage.getRecipients(RecipientType.BCC)));
-			headers.put(MailAttributeKeys.CC, toStringArray(mailMessage.getRecipients(RecipientType.CC)));
-			headers.put(MailAttributeKeys.TO, toStringArray(mailMessage.getRecipients(RecipientType.TO)));
-			headers.put(MailAttributeKeys.REPLY_TO, toStringArray(mailMessage.getReplyTo()));
+			headers.put(MailAttributeKeys.FROM, convertToString(mailMessage.getFrom()));
+			headers.put(MailAttributeKeys.BCC, convertToStringArray(mailMessage.getRecipients(RecipientType.BCC)));
+			headers.put(MailAttributeKeys.CC, convertToStringArray(mailMessage.getRecipients(RecipientType.CC)));
+			headers.put(MailAttributeKeys.TO, convertToStringArray(mailMessage.getRecipients(RecipientType.TO)));
+			headers.put(MailAttributeKeys.REPLY_TO, convertToString(mailMessage.getReplyTo()));
 			headers.put(MailAttributeKeys.SUBJECT, mailMessage.getSubject());
 			return headers;
 		}
@@ -142,7 +142,6 @@ public abstract class AbstractMailHeaderMapper implements MessageHeaderMapper<Mi
 		}
 	}
 
-
 	protected String retrieveAsString(MessageHeaders headers, String key) {
 		Object value = headers.get(key);
 		return (value instanceof String) ? (String) value : null;
@@ -159,8 +158,17 @@ public abstract class AbstractMailHeaderMapper implements MessageHeaderMapper<Mi
 		return null;
 	}
 
-	
-	protected String[] toStringArray(Address[] addresses) {
+	private String convertToString(Address[] addresses) {
+		if (addresses == null || addresses.length == 0) {
+			return null;
+		}
+		if (addresses.length != 1) {
+			throw new IllegalStateException("expected a single value but received an Array");
+		}
+		return addresses[0].toString();
+	}
+
+	private String[] convertToStringArray(Address[] addresses) {
 		if (addresses != null) {
 			String[] addressStrings = new String[addresses.length];
 			for (int i = 0; i < addresses.length; i++) {
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapperTests.java b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapperTests.java
new file mode 100644
index 0000000000..c4d67ea843
--- /dev/null
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapperTests.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.adapter.mail;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.mail.Address;
+import javax.mail.MessagingException;
+import javax.mail.Message.RecipientType;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
+import org.easymock.classextension.EasyMock;
+import org.junit.Test;
+
+import org.springframework.integration.message.MessageHeaders;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * @author Mark Fisher
+ */
+public class DefaultMailMessageHeaderMapperTests {
+
+	@Test
+	public void mapExactlyOneFromAttributeFromMimeMessage() throws MessagingException {
+		DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
+		MimeMessage mailMessageMock = EasyMock.createMock(MimeMessage.class);
+		Address[] fromAddresses = new Address[] { new InternetAddress("from@example.org") };
+		EasyMock.expect(mailMessageMock.getFrom()).andReturn(fromAddresses);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.BCC)).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.CC)).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.TO)).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getReplyTo()).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getSubject()).andReturn("mail test");
+		EasyMock.replay(mailMessageMock);
+		Map<String, Object> headers = mapper.mapToMessageHeaders(mailMessageMock);
+		Object fromHeader = headers.get(MailAttributeKeys.FROM);
+		assertNotNull(fromHeader);
+		assertTrue(fromHeader instanceof String);
+		assertEquals("from@example.org", fromHeader);
+	}
+
+	@Test
+	public void mapExactlyOneReplyToAttributeFromMimeMessage() throws MessagingException {
+		DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
+		MimeMessage mailMessageMock = EasyMock.createMock(MimeMessage.class);
+		Address[] replyToAddresses = new Address[] { new InternetAddress("replyTo@example.org") };
+		EasyMock.expect(mailMessageMock.getFrom()).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.BCC)).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.CC)).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.TO)).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getReplyTo()).andReturn(replyToAddresses);
+		EasyMock.expect(mailMessageMock.getSubject()).andReturn("mail test");
+		EasyMock.replay(mailMessageMock);
+		Map<String, Object> headers = mapper.mapToMessageHeaders(mailMessageMock);
+		Object replyToHeader = headers.get(MailAttributeKeys.REPLY_TO);
+		assertNotNull(replyToHeader);
+		assertTrue(replyToHeader instanceof String);
+		assertEquals("replyTo@example.org", replyToHeader);
+	}
+
+	@Test
+	public void mapMultipleToAttributesFromMimeMessage() throws MessagingException {
+		DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
+		MimeMessage mailMessageMock = EasyMock.createMock(MimeMessage.class);
+		Address[] toAddresses = new Address[] {
+			new InternetAddress("a@example.org"), new InternetAddress("b@example.org"), new InternetAddress("c@example.org")
+		};
+		EasyMock.expect(mailMessageMock.getFrom()).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.BCC)).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.CC)).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getRecipients(RecipientType.TO)).andReturn(toAddresses);
+		EasyMock.expect(mailMessageMock.getReplyTo()).andReturn(new Address[0]);
+		EasyMock.expect(mailMessageMock.getSubject()).andReturn("mail test");
+		EasyMock.replay(mailMessageMock);
+		Map<String, Object> headers = mapper.mapToMessageHeaders(mailMessageMock);
+		Object toHeader = headers.get(MailAttributeKeys.TO);
+		assertNotNull(toHeader);
+		assertTrue(toHeader instanceof String[]);
+		String[] addresses = (String[]) toHeader;
+		assertTrue(ObjectUtils.containsElement(addresses, "a@example.org"));
+		assertTrue(ObjectUtils.containsElement(addresses, "b@example.org"));
+		assertTrue(ObjectUtils.containsElement(addresses, "c@example.org"));
+	}
+
+	@Test
+	public void mapReplyToValueFromHeadersToMimeMessage() throws MessagingException {
+		DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
+		Map<String, Object> headerMap = new HashMap<String, Object>();
+		headerMap.put(MailAttributeKeys.REPLY_TO, "replyTo@example.org");
+		MessageHeaders headers = new MessageHeaders(headerMap);
+		MimeMessage mailMessageMock = EasyMock.createNiceMock(MimeMessage.class);
+		EasyMock.replay(mailMessageMock);
+		MimeMessage mimeMessage = new MimeMessage(mailMessageMock);
+		mapper.mapFromMessageHeaders(headers, mimeMessage);
+		Address[] replyToAddresses = mimeMessage.getReplyTo();
+		assertEquals(1, replyToAddresses.length);
+		assertEquals("replyTo@example.org", replyToAddresses[0].toString());
+	}
+
+	@Test
+	public void mapFromValueFromHeadersToMimeMessage() throws MessagingException {
+		DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
+		Map<String, Object> headerMap = new HashMap<String, Object>();
+		headerMap.put(MailAttributeKeys.FROM, "from@example.org");
+		MessageHeaders headers = new MessageHeaders(headerMap);
+		MimeMessage mailMessageMock = EasyMock.createNiceMock(MimeMessage.class);
+		EasyMock.replay(mailMessageMock);
+		MimeMessage mimeMessage = new MimeMessage(mailMessageMock);
+		mapper.mapFromMessageHeaders(headers, mimeMessage);
+		Address[] fromAddresses = mimeMessage.getFrom();
+		assertEquals(1, fromAddresses.length);
+		assertEquals("from@example.org", fromAddresses[0].toString());
+	}
+
+	@Test
+	public void mapMultileToValuesFromHeadersToMimeMessage() throws MessagingException {
+		DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
+		Map<String, Object> headerMap = new HashMap<String, Object>();
+		String[] addressStrings = new String[] { "a@example.org", "b@example.org", "c@example.org" };
+		headerMap.put(MailAttributeKeys.TO, addressStrings);
+		MessageHeaders headers = new MessageHeaders(headerMap);
+		MimeMessage mailMessageMock = EasyMock.createNiceMock(MimeMessage.class);
+		EasyMock.replay(mailMessageMock);
+		MimeMessage mimeMessage = new MimeMessage(mailMessageMock);
+		mapper.mapFromMessageHeaders(headers, mimeMessage);
+		Address[] toAddresses = mimeMessage.getRecipients(RecipientType.TO);
+		assertEquals(3, toAddresses.length);
+		assertTrue(ObjectUtils.containsElement(toAddresses, new InternetAddress("a@example.org")));
+		assertTrue(ObjectUtils.containsElement(toAddresses, new InternetAddress("b@example.org")));
+		assertTrue(ObjectUtils.containsElement(toAddresses, new InternetAddress("c@example.org")));
+	}
+
+}