|
@@ -566,22 +566,22 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
|
|
|
} else {
|
|
|
$send_to = $orig_header->getAddr_s('from');
|
|
|
}
|
|
|
- $subject = $orig_header->subject;
|
|
|
+ $subject = decodeHeader($orig_header->subject);
|
|
|
$subject = str_replace('"', "'", $subject);
|
|
|
$subject = trim($subject);
|
|
|
if (substr(strtolower($subject), 0, 3) != 're:') {
|
|
|
$subject = 'Re: ' . $subject;
|
|
|
}
|
|
|
/* this corrects some wrapping/quoting problems on replies */
|
|
|
- $rewrap_body = explode("\n", charset_decode_japanese($body));
|
|
|
+ $rewrap_body = explode("\n", $body);
|
|
|
|
|
|
$body = getReplyCitation($orig_header->from->personal);
|
|
|
- $cnt = count($rewrap_body);
|
|
|
+ $cnt = count($rewrap_body);
|
|
|
for ($i=0;$i<$cnt;$i++) {
|
|
|
// sqWordWrap($rewrap_body[$i], ($editor_size - 2));
|
|
|
if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
|
|
|
$gt = $matches[1];
|
|
|
- $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n";
|
|
|
+ $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n";
|
|
|
} else {
|
|
|
$body .= '> ' . $rewrap_body[$i] . "\n";
|
|
|
}
|