added another fix for the odd addition of newlines

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

diff --git a/functions/smtp.php b/functions/smtp.php
index 68c291f473583a64183690141bf40852598e915c..f456710cc3a308e1b9151ab47e4cc5204740c1f0 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -491,7 +491,7 @@
 
       $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1);
 
-      if ($reply_id) {
+      if ($reply_id = trim($reply_id)) {
          sqimap_mailbox_select ($imap_stream, $mailbox);
          sqimap_messages_flag ($imap_stream, $reply_id, $reply_id, 'Answered');
 
@@ -523,6 +523,7 @@
          $length = sendSMTP($t, $c, $b, $subject, $body, $more_headers);
       }
 
+      $sent_folder = trim($sent_folder);
       if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) {
          sqimap_append ($imap_stream, $sent_folder, $length);
          write822Header ($imap_stream, $t, $c, $b, $subject, $more_headers);