diff --git a/src/lib-sieve/tst-address.c b/src/lib-sieve/tst-address.c
index bb33094ee1ad3ed052f7da8c40978f599d2905c0..9201b006985fe9420752b2a129142bae06fb0a7d 100644
--- a/src/lib-sieve/tst-address.c
+++ b/src/lib-sieve/tst-address.c
@@ -121,7 +121,7 @@ static const char * const _allowed_headers[] = {
 	"x-report-abuse-to",
 
 	/* Undocumented */
-	"x-beenthere", "x-original-to",
+	"x-beenthere", "x-original-from", "x-original-to",
 
 	NULL
 };
diff --git a/tests/test-address.svtest b/tests/test-address.svtest
index 25f5d499f3de374215490cbecf740a718aa81433..3f7012fe4050a97aa941a677a719e4fdec87d189 100644
--- a/tests/test-address.svtest
+++ b/tests/test-address.svtest
@@ -278,6 +278,7 @@ Abuse-Reports-To: tttt@friep.frop
 X-Complaints-To: uuuu@friep.frop
 X-Report-Abuse-To: vvvv@friep.frop
 X-BeenThere: wwww@friep.frop
+X-Original-From: xxxx@friep.frop
 X-Original-To: yyyy@friep.frop
 Subject: Berichtje:
 
@@ -413,7 +414,11 @@ test "Address headers" {
 	if not address "x-beenthere" "wwww@friep.frop" {
 		test_fail "x-beenthere header not recognized";
 	}
-	
+
+	if not address "x-original-from" "xxxx@friep.frop" {
+		test_fail "x-original-from header not recognized";
+	}
+
 	if not address "x-original-to" "yyyy@friep.frop" {
 		test_fail "x-original-to header not recognized";
 	}