diff --git a/workflow/engine/classes/class.AppDocumentDrive.php b/workflow/engine/classes/class.AppDocumentDrive.php
index c00396c98..40228d30a 100644
--- a/workflow/engine/classes/class.AppDocumentDrive.php
+++ b/workflow/engine/classes/class.AppDocumentDrive.php
@@ -411,7 +411,6 @@ class AppDocumentDrive
                 $emails = !empty($emails) ? explode('|', $emails) : array();
                 $result = null;
                 foreach ($emails as $index => $email) {
-                    $result = null;
                     if (!empty($email)) {
                         if ($index == 0 && $fields['SYNC_WITH_DRIVE'] == 'UNSYNCHRONIZED') {
                             if ($log) {
@@ -461,7 +460,6 @@ class AppDocumentDrive
                 $fields['SYNC_WITH_DRIVE'] = 'NO_EXIST_FILE_PM';
                 if ($log) {
                     eprintln('File no exists:' . $name , 'red');
-                    //eprintln($realPath , 'red');
                 }
             }
             $appDoc->update($fields);
diff --git a/workflow/engine/methods/cases/cases_ShowDocument.php b/workflow/engine/methods/cases/cases_ShowDocument.php
index 2f557f114..17d63f6ef 100755
--- a/workflow/engine/methods/cases/cases_ShowDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowDocument.php
@@ -107,6 +107,7 @@ if (! $sw_file_exists) {
         $res['message'] = $oAppDocument->Fields['APP_DOC_FILENAME'];
         print G::json_encode( $res );
     } else {
+        $nameFile = $oAppDocument->Fields['APP_DOC_FILENAME'];
         $licensedFeatures = &PMLicensedFeatures::getSingleton();
         $downloadStatus = false;
         if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
@@ -116,14 +117,20 @@ if (! $sw_file_exists) {
                 $fieldDrive = $oAppDocument->getAppDocDriveDownload();
                 $drive->loadUser($_SESSION['USER_LOGGED']);
                 $uidDrive = $drive->changeUrlDrive($oAppDocument->Fields, $oAppDocument->getAppDocType());
-                $result = $drive->download($uidDrive);
-                //verify download
-                file_put_contents($oAppDocument->Fields['APP_DOC_FILENAME'], $result);
-                $downloadStatus = true;
+                $fileContent = $drive->download($uidDrive);
+                if ($fileContent !== null) {
+                    $downloadStatus = true;
+                    header('Content-Description: File Transfer');
+                    header('Content-Disposition: attachment; filename='.$nameFile);
+                    header('Content-Transfer-Encoding: binary');
+                    header('Set-Cookie: fileLoading=true');
+                    echo $fileContent;
+                    exit();
+                }
             }
         }
         if (!$downloadStatus) {
-            G::streamFile( $realPath, $bDownload, $oAppDocument->Fields['APP_DOC_FILENAME'] ); //download
+            G::streamFile( $realPath, $bDownload, $nameFile ); //download
         }
 
 
diff --git a/workflow/engine/methods/cases/cases_ShowOutputDocument.php b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
index 0d8badfca..064ecd863 100755
--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
@@ -109,6 +109,7 @@ if (! $sw_file_exists) {
         $res['message'] = $info['basename'] . $ver . '.' . $ext;
         print G::json_encode( $res );
     } else {
+        $nameFile = $info['basename'] . $ver . '.' . $ext;
         $licensedFeatures = &PMLicensedFeatures::getSingleton();
         $downloadStatus = false;
         if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
@@ -119,14 +120,20 @@ if (! $sw_file_exists) {
                 $drive->loadUser($_SESSION['USER_LOGGED']);
                 $type = $ext == 'doc' ? 'OUTPUT_DOC' : 'OUTPUT_PDF';
                 $uidDrive = $drive->changeUrlDrive($oAppDocument->Fields, $type);
-                $result = $drive->download($uidDrive);
-                //verify download file
-                file_put_contents($info['basename'] . $ver . '.' . $ext , $result);
-                $downloadStatus = true;
+                $fileContent = $drive->download($uidDrive);
+                if ($fileContent !== null) {
+                    $downloadStatus = true;
+                    header('Content-Description: File Transfer');
+                    header('Content-Disposition: attachment; filename='.$nameFile);
+                    header('Content-Transfer-Encoding: binary');
+                    header('Set-Cookie: fileLoading=true');
+                    echo $fileContent;
+                    exit();
+                }
             }
         }
         if (!$downloadStatus) {
-            G::streamFile( $realPath, $download, $info['basename'] . $ver . '.' . $ext ); //download
+            G::streamFile( $realPath, $download, $nameFile); //download
         }
 
         //die($realPath);