diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php
index 5aaa016f6..660dd7ff7 100755
--- a/workflow/engine/methods/cases/casesListExtJsRedirector.php
+++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php
@@ -18,7 +18,7 @@ if (isset( $_GET['ux'] )) {
         default:
             $url = 'casesListExtJs';
     }
-} else if( isset( $_GET['gmail']) && !empty($enablePMGmail) && $enablePMGmail==1 ){
+} else if( key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && !empty($enablePMGmail) && $enablePMGmail==1 ){
     $url = 'derivatedGmail';
 } else {
     $url = 'casesListExtJs';
diff --git a/workflow/engine/methods/cases/derivatedGmail.php b/workflow/engine/methods/cases/derivatedGmail.php
index f809e0490..d2fbff684 100644
--- a/workflow/engine/methods/cases/derivatedGmail.php
+++ b/workflow/engine/methods/cases/derivatedGmail.php
@@ -39,7 +39,8 @@ G::LoadClass( "pmDrive" );
 $pmDrive = new PMDrive();
 $enablePMGmail = $pmDrive->getStatusService();
 if(key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && !empty($enablePMGmail) && $enablePMGmail==1 ){
-	//$_SESSION['gmail'] = 0;
+	$_SESSION['gmail'] = 0;
+	unset($_SESSION['gmail']); //cleaning session
 	$mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/neoclassic/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent';
 } else{
 	$mUrl = 'casesListExtJs';