diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index ac061a15f4b4a7ac74bb82b2ed4aa9710513fde6..ea05d9363e2e6a2e2dedac07dcbf7c50817a8cd4 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -63,7 +63,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1089 test1090 test1091 test1092 test1093 test1094 test1095 test1096   \
  test1097 test560 test561 test1098 test1099 test562 test563 test1100       \
  test564 test1101 test1102 test1103 test1104 test299 test310 test311       \
- test312 test1105 test565 test800 test1106
+ test312 test1105 test565 test800 test1106 test801
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test801 b/tests/data/test801
new file mode 100644
index 0000000000000000000000000000000000000000..271d8d1f78bd325584d9f6c572433902d0e240c3
--- /dev/null
+++ b/tests/data/test801
@@ -0,0 +1,47 @@
+<testcase>
+<info>
+<keywords>
+IMAP
+FETCH
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+  yours sincerely
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+imap
+</server>
+ <name>
+IMAP FETCH
+ </name>
+ <command>
+imap://%HOSTIP:%IMAPPORT/801 -u user:secret
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+B LOGIN user secret
+C SELECT 801
+D FETCH 1 BODY[TEXT]
+A LOGOUT
+</protocol>
+</verify>
+</testcase>