Index: t3lib/class.t3lib_div.php
===================================================================
--- t3lib/class.t3lib_div.php	(revision 5723)
+++ t3lib/class.t3lib_div.php	(working copy)
@@ -5123,6 +5123,16 @@
 					$qpValue = t3lib_div::quoted_printable($part,1000);
 					if ($part!=$qpValue)	{
 						$qpValue = str_replace(' ','_',$qpValue);	// Encoded words in the header should not contain non-encoded spaces. "_" is a shortcut for "=20". See RFC 2047 for details.
+						
+						/**
+						 * Ivan Kartolo, 2009-03-22
+						 * See RFC 1342 (http://tools.ietf.org/html/rfc1342), no question mark in the quoted-printable text, since it will be used as seperator of charset
+						 */
+						if (strpos($qpValue,'?')) {
+							$qpValue = str_replace('?',sprintf('=%02X',ord('?')),$qpValue);
+						}
+						/* end patch */
+						
 						$part = '=?'.$charset.'?Q?'.$qpValue.'?=';
 					}
 				break;