# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1043070853 -7200
# Node ID 961617a56fb90adb58f2479af22ae716f5385321
# Parent  907b9845eaa6f668680f190efdac2ee49b67d74b
Strip CR and LF characters too.

diff -r 907b9845eaa6 -r 961617a56fb9 src/lib-imap/imap-base-subject.c
--- a/src/lib-imap/imap-base-subject.c	Mon Jan 20 15:53:31 2003 +0200
+++ b/src/lib-imap/imap-base-subject.c	Mon Jan 20 15:54:13 2003 +0200
@@ -53,7 +53,7 @@
 
 	/* check if we need to do anything */
 	while (*data != '\0') {
-		if (*data == '\t' ||
+		if (*data == '\t' || *data == '\n' || *data == '\r' ||
 		    (*data == ' ' && (data[1] == ' ' || data[1] == '\t')))
 			break;
 		data++;
@@ -65,7 +65,8 @@
 	/* @UNSAFE: convert/pack the whitespace */
 	dest = data; last_lwsp = FALSE;
 	while (*data != '\0') {
-		if (*data == '\t' || *data == ' ') {
+		if (*data == '\t' || *data == ' ' ||
+		    *data == '\r' || *data == '\n') {
 			if (!last_lwsp) {
 				*dest++ = ' ';
 				last_lwsp = TRUE;