From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 23 Aug 2002 16:02:51 +0000 (+0000)
Subject: OOOpps. Looks like Marc and I were working on the same code 8)
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=3202aaf3b3e2a86b24a0db9aa589c47a98a18c4b

OOOpps. Looks like Marc and I were working on the same code 8)


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3431 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/src/compose.php b/src/compose.php
index 9ffb6633..f8746036 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -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";
 	      }