diff --git a/cyrus-imapd-2.1.15-nobarenewlinescheck.patch b/cyrus-imapd-2.1.15-nobarenewlinescheck.patch
deleted file mode 100644
index 9c3990f..0000000
--- a/cyrus-imapd-2.1.15-nobarenewlinescheck.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cyrus-imapd-2.1.15/imap/message.c.orig	2003-11-11 15:45:11.000000000 +0100
-+++ cyrus-imapd-2.1.15/imap/message.c	2003-11-11 15:35:11.000000000 +0100
-@@ -246,7 +246,8 @@
- 
- 	for (p = (unsigned char *)buf; *p; p++) {
- 	    if (*p == '\n') {
--		if (!sawcr) r = IMAP_MESSAGE_CONTAINSNL;
-+		/* Do *NOT* check for RFC compliant line breaks (bare newlines) */
-+		/* if (!sawcr) r = IMAP_MESSAGE_CONTAINSNL; */
- 		sawcr = 0;
- 		if (blankline) {
- 		    inheader = 0;
diff --git a/cyrus-imapd-2.3.7-nobarenewlinescheck.patch b/cyrus-imapd-2.3.7-nobarenewlinescheck.patch
new file mode 100644
index 0000000..2c4bb9c
--- /dev/null
+++ b/cyrus-imapd-2.3.7-nobarenewlinescheck.patch
@@ -0,0 +1,14 @@
+--- cyrus-imapd-2.3.7/imap/message.c	2006-10-28 22:18:08.000000000 +0200
++++ cyrus-imapd-2.3.7/imap/message.c.nobarenewlinescheck	2006-10-28 22:21:55.000000000 +0200
+@@ -256,8 +256,9 @@
+ 		r = IMAP_MESSAGE_CONTAINSNULL;
+ 	    }
+ 	    else if (*p == '\n') {
+-		if (!sawcr && (inheader || !allow_null))
+-		    r = IMAP_MESSAGE_CONTAINSNL;
++		/* Do *NOT* check for RFC compliant line breaks (bare newlines) */
++		/* if (!sawcr && (inheader || !allow_null))
++		    r = IMAP_MESSAGE_CONTAINSNL; */
+ 		sawcr = 0;
+ 		if (blankline) {
+ 		    inheader = 0;
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 475ed42..7e2594f 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -137,7 +137,7 @@ Patch3: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.8/cyrus-imapd-2.3.8-r
 Patch4: http://servercc.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
 Patch5: cyrus-imapd-2.2.12-munge8bit.patch
 Patch6: cyrus-imapd-2.1.16-getrlimit.patch
-Patch7: cyrus-imapd-2.1.15-nobarenewlinescheck.patch
+Patch7: cyrus-imapd-2.3.7-nobarenewlinescheck.patch
 Patch8: cyrus-imapd-2.2.10-groupcache.patch
 Patch9: cyrus-imapd-2.3.1-config_defaults.patch
 Patch10: cyrus-imapd-acceptinvalidfrom.patch
@@ -813,6 +813,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 11 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-3
+- updated the no-bare-nl patch (#235569), thanks to Matthias Hensler
+
 * Wed Apr 04 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-2
 - fixed mboxlist backup rotation (#197054)