--- /var/tmp/portage/cyrus-imapd-2.1.11-r1/work/cyrus-imapd-2.1.11/imap/message.c	2002-08-13 18:46:32.000000000 +0200
+++ imap/message.c	2003-04-03 21:20:59.000000000 +0200
@@ -229,6 +229,7 @@
     int n;
     int sawcr = 0, sawnl;
     int reject8bit = config_getswitch("reject8bit", 0);
+    int allow8bitheaders = config_getswitch("allow8bitheaders", 0);
     int inheader = 1, blankline = 1;
 
     while (size) {
@@ -267,7 +268,16 @@
 		    } else {
 			/* We have been configured to munge all mail of this
 			   form. */
-			*p = 'X';
+			if (allow8bitheaders) {
+			/* We allow all mail with 8 bit headers 
+			   and do not force our users to change
+			   the way of the world because of one 
+			   stupid rfc 2046 (or was it 2047?) */
+			}
+			else {
+			  /* We replace each 8bit-Char with X */
+			  *p = 'X';
+			}
 		    }
 		}
 	    }