Index: sources/functions.php
===================================================================
RCS file: /cvsroot/usebb/UseBB/sources/functions.php,v
retrieving revision 1.213
diff -r1.213 functions.php
669,673c669,673
< 		$body = str_replace("\r\n", "\n", $rawbody);
< 		
< 		// For Windows
< 		if ( strstr(PHP_OS, 'WIN') !== false )
< 			$body = str_replace("\n", "\r\n", $rawbody);
---
> 		$body = str_replace(array("\r\n","\r"), "\n", $rawbody);
> 
> 		//  Windows:\r\n Other:\n
> 		$cr = strstr(PHP_OS, 'WIN') !== false? "\r\n": "\n";
> 		$body = str_replace("\n", $cr, $rawbody);
692,694d691
< 		$headers[] = 'Content-Type: text/plain; charset='.$charset;
< 		if ( strtolower($lang['character_encoding']) == 'utf-8' )
< 			$headers[] = 'Content-Transfer-Encoding: 8bit';
703c700
< 			if ( !mb_send_mail($to, $subject, $body, join("\r\n", $headers)) )
---
> 			if ( !mb_send_mail($to, $subject, $body, join($cr, $headers),"-f$from_email") )
706a704,705
> 			if ( strtolower($lang['character_encoding']) == 'utf-8' )
> 				$headers[] = 'Content-Transfer-Encoding: 8bit';
708c707
< 			if ( !mail($to, $subject, $body, join("\r\n", $headers)) )
---
> 			if ( !mail($to, $subject, $body, join($cr, $headers),"-f$from_email") )
Index: sources/post_reply.php
===================================================================
RCS file: /cvsroot/usebb/UseBB/sources/post_reply.php,v
retrieving revision 1.59
diff -r1.59 post_reply.php
141c141,144
< 						
---
> 						if ( function_exists( "mb_language")) {
> 							mb_language( $functions->get_config('language'));
> 							mb_internal_encoding( $lang['character_encoding']);
> 						}
143d145
<