Talking about stupid... backing out your own changes is stupid.

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

diff --git a/src/compose.php b/src/compose.php
index 61d1c208aa2732fc8bcefda5f58c8e0618fc9cd7..1cd22ce72d46f3aaf5c939e437a8c0294014d4eb 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -666,8 +666,8 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true);            
             $subject = decodeHeader($orig_header->subject,false,true);
 //            /* remember the references and in-reply-to headers in case of an reply */
             $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true);            
             $subject = decodeHeader($orig_header->subject,false,true);
 //            /* remember the references and in-reply-to headers in case of an reply */

-//            $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
-//            $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
+            $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
+            $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;

             $body_ary = explode("\n", $body);
             $cnt = count($body_ary) ;
             $body = '';
             $body_ary = explode("\n", $body);
             $cnt = count($body_ary) ;
             $body = '';


@@ -1435,9 +1435,9 @@ function deliverMessage($composeMessage, $draft=false) {
         } else {    
             $rfc822_header->encoding = '8bit';
         }            
         } else {    
             $rfc822_header->encoding = '8bit';
         }            

-    }
-    if ($default_charset) {
-        $content_type->properties['charset']=$default_charset;
+        if ($default_charset) {
+            $content_type->properties['charset']=$default_charset;
+       }

     }
         
     $rfc822_header->content_type = $content_type;
     }
         
     $rfc822_header->content_type = $content_type;