diff --git a/src/vmime/headerFieldFactory.cpp b/src/vmime/headerFieldFactory.cpp
index db281fae..b779d211 100644
--- a/src/vmime/headerFieldFactory.cpp
+++ b/src/vmime/headerFieldFactory.cpp
@@ -50,7 +50,6 @@ headerFieldFactory::headerFieldFactory() {
 
 	registerField <mailboxField>(vmime::fields::FROM);
 	registerField <mailboxField>(vmime::fields::SENDER);
-	registerField <mailboxField>(vmime::fields::REPLY_TO);
 	registerField <mailboxField>(vmime::fields::DELIVERED_TO);
 
 	// Register standard field values
@@ -62,7 +61,7 @@ headerFieldFactory::headerFieldFactory() {
 	registerFieldValue <datetime>(vmime::fields::DATE);
 	registerFieldValue <relay>(vmime::fields::RECEIVED);
 	registerFieldValue <text>(vmime::fields::SUBJECT);
-	registerFieldValue <mailbox>(vmime::fields::REPLY_TO);
+	registerFieldValue <addressList>(vmime::fields::REPLY_TO);
 	registerFieldValue <mailbox>(vmime::fields::DELIVERED_TO);
 	registerFieldValue <text>(vmime::fields::ORGANIZATION);
 	registerFieldValue <text>(vmime::fields::USER_AGENT);