diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 6f0b619d6..aab78134d 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -1017,14 +1017,17 @@ class wsBase
             );
 
             $oSpool->create( $messageArray );
-            $oSpool->sendMail();
+            if ($gmail != 1){
+	            $oSpool->sendMail();
 
-            if ($oSpool->status == 'sent') {
-                $result = new wsResponse( 0, G::loadTranslation( 'ID_MESSAGE_SENT' ) . ": " . $sTo );
+	            if ($oSpool->status == 'sent') {
+	                $result = new wsResponse( 0, G::loadTranslation( 'ID_MESSAGE_SENT' ) . ": " . $sTo );
+	            } else {
+	                $result = new wsResponse( 29, $oSpool->status . ' ' . $oSpool->error . print_r( $aSetup, 1 ) );
+	            }
             } else {
-                $result = new wsResponse( 29, $oSpool->status . ' ' . $oSpool->error . print_r( $aSetup, 1 ) );
+            	$result = "";
             }
-
             return $result;
         } catch (Exception $e) {
             return new wsResponse( 100, $e->getMessage() );
diff --git a/workflow/public_html/pmGmail/sso.php b/workflow/public_html/pmGmail/sso.php
index 300330268..27ee3e50f 100644
--- a/workflow/public_html/pmGmail/sso.php
+++ b/workflow/public_html/pmGmail/sso.php
@@ -124,8 +124,6 @@ if ($action == "draft"){
 	curl_setopt( $curlApp, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt( $curlApp, CURLOPT_SSL_VERIFYPEER,false);
 	curl_setopt( $curlApp, CURLOPT_CONNECTTIMEOUT, 0);
-	curl_setopt( $curlApp, CURLOPT_FRESH_CONNECT, true);
-	curl_setopt( $curlApp, CURLOPT_TIMEOUT_MS, 1);
 
 	$curl_response_app = curl_exec( $curlApp );
 	curl_close( $curlApp );