diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e3047804df..5c06940800 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-21 19:48 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbtip/smtpcli.prg
+    ! Fixed long time SMTP protocol implementation bug reported 
+      (with patch) by Francesco Perillo. Thank you.
+      The problem manifested itself only with strictly 
+      standard compliant SMTP server (setups?) like recent 
+      Exim versions.
+    + Upped timeout from 5000 to 50000.
+
 2009-11-21 18:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Added clang support to link to dylib with full dirspec 
diff --git a/harbour/contrib/hbtip/smtpcli.prg b/harbour/contrib/hbtip/smtpcli.prg
index 8b3acdf1a6..d7096b9eb1 100644
--- a/harbour/contrib/hbtip/smtpcli.prg
+++ b/harbour/contrib/hbtip/smtpcli.prg
@@ -99,7 +99,7 @@ METHOD New( oUrl, bTrace, oCredentials ) CLASS tIPClientSMTP
    ::super:New( oUrl, bTrace, oCredentials )
 
    ::nDefaultPort := iif( ::oUrl:cProto == "smtps", 465, 25 )
-   ::nConnTimeout := 5000
+   ::nConnTimeout := 50000
    ::nAccessMode := TIP_WO  // a write only
 
    RETURN Self
@@ -110,6 +110,10 @@ METHOD Open( cUrl, lTLS ) CLASS tIPClientSMTP
       RETURN .F.
    ENDIF
 
+   IF ! ::GetOk()
+      RETURN .F.
+   ENDIF
+
    DEFAULT lTLS TO .F.
 
    IF lTLS
@@ -129,6 +133,10 @@ METHOD OpenSecure( cUrl, lTLS ) CLASS tIPClientSMTP
       RETURN .F.
    ENDIF
 
+   IF ! ::GetOk()
+      RETURN .F.
+   ENDIF
+
    DEFAULT lTLS TO .F.
 
    IF lTLS