--- mailody/src/smtp.cpp1	2007-04-02 23:41:07.000000000 +0200
+++ mailody/src/smtp.cpp	2007-10-25 20:37:50.000000000 +0200
@@ -150,7 +150,7 @@
             dataIn.find("AUTH") < dataIn.find("LOGIN"))
             m_authPossible = true;
 
-        if (dataIn.find("\n250 "))
+        if (dataIn.find("\n250 ") != -1)
             slotTLS();
     }
     else if (m_currentCommand == TLS)
@@ -192,15 +192,21 @@
         {
             emit error(i18n("Authentication did not succeed"));
             return;
+        } 
+        else
+        {
+            m_currentCommand = From;
+            m_socket->write("MAIL FROM:<" + m_email + ">");
         }
 
+
         // Please remember, this can be the response to hte Helo or to
         // a previous Pass command.... TLS already send the headers, so
         // that should pass through....
         if (dataIn.find("250 ") > -1 || m_tls || !m_authNeeded)
         {
             m_currentCommand = From;
-            m_socket->write("MAIL FROM:" + m_email);
+            m_socket->write("MAIL FROM:<" + m_email + ">");
         }
     }
     else if (m_currentCommand == From || !m_tos.isEmpty())
@@ -227,7 +233,7 @@
         Address.fromUnicodeString( to,"UTF-8");
         lastEmail = Address.email();
 
-        m_socket->write("RCPT TO:" + lastEmail);
+        m_socket->write("RCPT TO:<" + lastEmail+">");
     }
     else if (m_currentCommand == Rcpt )
     {