diff --git a/src/lib-sieve-tool/Makefile.am b/src/lib-sieve-tool/Makefile.am
index ad38571ed56f433e08e7592edc2592a5c965bb99..33868248b4609dd29cdbf0c9876db442eedbe862 100644
--- a/src/lib-sieve-tool/Makefile.am
+++ b/src/lib-sieve-tool/Makefile.am
@@ -2,13 +2,12 @@ noinst_LTLIBRARIES = libsieve-tool.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-sieve \
+	-I$(top_srcdir)/src/lib-sieve/util \
 	$(LIBDOVECOT_INCLUDE) \
 	$(LIBDOVECOT_SERVICE_INCLUDE)
 
 libsieve_tool_la_SOURCES = \
-	sieve-tool.c \
-	mail-raw.c
+	sieve-tool.c
 
 noinst_HEADERS = \
-	sieve-tool.h \
-	mail-raw.h
+	sieve-tool.h
diff --git a/src/lib-sieve/util/Makefile.am b/src/lib-sieve/util/Makefile.am
index 8f2d8c5e8627bc2d0a7a81a76e9e32c657ba3810..f3f51a52847a12d77473c1a854296d2900cddb14 100644
--- a/src/lib-sieve/util/Makefile.am
+++ b/src/lib-sieve/util/Makefile.am
@@ -8,10 +8,12 @@ AM_CPPFLAGS = \
 libsieve_util_la_DEPENDENCIES = $(LIBDOVECOT_STORAGE_DEPS) $(LIBDOVECOT_DEPS)
 
 libsieve_util_la_SOURCES = \
+	mail-raw.c \
 	edit-mail.c \
 	rfc2822.c
 
 headers = \
+	mail-raw.h \
 	edit-mail.h \
 	rfc2822.h
 
diff --git a/src/lib-sieve-tool/mail-raw.c b/src/lib-sieve/util/mail-raw.c
similarity index 100%
rename from src/lib-sieve-tool/mail-raw.c
rename to src/lib-sieve/util/mail-raw.c
diff --git a/src/lib-sieve-tool/mail-raw.h b/src/lib-sieve/util/mail-raw.h
similarity index 100%
rename from src/lib-sieve-tool/mail-raw.h
rename to src/lib-sieve/util/mail-raw.h
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 8da7625fbacdc299736af63f30a3c6e3819af5a5..f7b85dc7f732db52298212e258a2a90fd4de3fca 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -2,6 +2,7 @@ noinst_PROGRAMS = testsuite
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-sieve \
+	-I$(top_srcdir)/src/lib-sieve/util \
 	-I$(top_srcdir)/src/lib-sieve/plugins/variables \
 	-I$(top_srcdir)/src/lib-sieve-tool \
 	$(LIBDOVECOT_INCLUDE) \