diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java
new file mode 100644
index 0000000000..a46a467bbb
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2002-2010 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.message;
+
+import java.util.Map;
+
+import org.springframework.integration.core.MessageHeaders;
+
+/**
+ * Generic strategy interface for mapping {@link MessageHeaders} to and from other
+ * types of objects. This would typically be used by adapters where the "other type"
+ * has a concept of headers or properties (HTTP, JMS, AMQP, etc).
+ * 
+ * @author Mark Fisher
+ *
+ * @param <T> type of the instance to and from which headers will be mapped.
+ */
+public interface HeaderMapper<T> {
+
+	void fromHeaders(MessageHeaders headers, T target);
+
+	Map<String, Object> toHeaders(T source);
+
+}