Bug fixes

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index c733470ddf4e4600970a549206199ec675b343cb..6241c02f0cf5a08abdc75a26e8edf87c31a47b97 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -53,6 +53,7 @@
       /** Lets start sending the actual message */
       fputs($smtpConnection, "DATA\n");
       fputs($smtpConnection, "Subject: $subject\n"); // Subject
+      fputs($smtpConnection, "From: <$from>\n"); // Subject
       fputs($smtpConnection, "To: <$to_list>\n");    // Who it's TO
       if ($cc_list) {
          fputs($smtpConnection, "Cc: <$cc_list>\n"); // Who the CCs are
@@ -60,7 +61,7 @@
       fputs($smtpConnection, "X-Mailer: SquirrelMail (version $version)\n"); // Identify SquirrelMail
       fputs($smtpConnection, "Reply-To: $from\n");
       fputs($smtpConnection, "MIME-Version: 1.0\n");
-      fputs($smtpConnection, "Content-Type: text/plain; charset=us-ascii\n");
+      fputs($smtpConnection, "Content-Type: text\n");
 
       fputs($smtpConnection, "$body\n"); // send the body of the message
       fputs($smtpConnection, ".\n"); // end the DATA part