githubFork/roundcubemail.git

			@@ -4,8 +4,8 @@
			+-----------------------------------------------------------------------+
			\| program/steps/mail/func.inc \|
			\| \|
			\| This file is part of the RoundCube Webmail client \|
			\| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland \|
			\| This file is part of the Roundcube Webmail client \|
			\| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland \|
			\| Licensed under the GNU GPL \|
			\| \|
			\| PURPOSE: \|
			@@ -661,7 +661,7 @@

			// charset was converted to UTF-8 in rcube_imap::get_message_part(),
			// -> change charset specification in HTML accordingly
			$charset_pattern = '(<meta\s+[^>]* content=)[\'"]?(\w+\/\w+;\s*charset=)([a-z0-9-_]+[\'"]?)';
			$charset_pattern = '(<meta\s+[^>]content=)[\'"]?(\w+\/\w+;\scharset=)([a-z0-9-_]+[\'"]?)';
			if (preg_match("/$charset_pattern/Ui", $html)) {
			$html = preg_replace("/$charset_pattern/i", '\\1"\\2'.RCMAIL_CHARSET.'"', $html);
			}
			@@ -671,7 +671,6 @@
			$html = '<head></head>'. $html;
			$html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0);
			}

			// turn relative into absolute urls
			$html = rcmail_resolve_base($html);

			@@ -844,7 +843,7 @@
			}

			// quote plain text
			$body = Q(join("\n", $a_lines), '', false);
			$body = Q(join("\n", $a_lines), 'dummy', false);

			// colorize signature
			$len = strlen($body);
			@@ -1613,7 +1612,7 @@
			"\t" . rcube_label("sent") . ': ' . format_date($message->headers->date, $RCMAIL->config->get('date_long')) . "\r\n" .
			"\r\n" . rcube_label("receiptnote") . "\r\n";

			$ua = $RCMAIL->config->get('useragent', "RoundCube Webmail (Version ".RCMAIL_VERSION.")");
			$ua = $RCMAIL->config->get('useragent', "Roundcube Webmail (Version ".RCMAIL_VERSION.")");
			$report = "Reporting-UA: $ua\r\n";

			if ($message->headers->to)