diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php
index b744a4c0d..152b278c4 100644
--- a/gulliver/system/class.headPublisher.php
+++ b/gulliver/system/class.headPublisher.php
@@ -26,6 +26,7 @@
  */
 
 use ProcessMaker\Plugins\PluginRegistry;
+use ProcessMaker\Core\System;
 
 /**
  * Class headPublisher
@@ -350,9 +351,6 @@ class headPublisher
         // enabled for particular use
         $head .= $this->getExtJsLibraries();
 
-        // $head .= "  <script type='text/javascript' src='/js/ext/draw2d.js'></script>\n";
-        // $head .= "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/translation." . SYS_LANG . ".js") . "\"></script>\n";
-
         if (!isset($this->extJsSkin) || $this->extJsSkin == '') {
             $this->extJsSkin = 'xtheme-gray';
             //$this->extJsSkin = 'gtheme';
@@ -365,6 +363,15 @@ class headPublisher
             $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/extjs_rtl.js") . "\"></script>\n";
         }
 
+        // Get the value defined in the ext_ajax_timeout
+        if (defined('EXT_AJAX_TIMEOUT')) {
+            $extAjaxTimeout = EXT_AJAX_TIMEOUT;
+        } else {
+            $config = System::getSystemConfiguration();
+            $extAjaxTimeout = $config['ext_ajax_timeout'];
+        }
+        $head .= '<script>ext_ajax_timeout = ' . $extAjaxTimeout . ';</script>';
+
         return $head;
     }
 
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 3886c2e9e..e91f90a66 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -399,6 +399,10 @@
         <index name="INDEX_APP_MSG_STATUS_ID">
             <index-column name="APP_MSG_STATUS_ID"/>
         </index>
+        <index name="indexAppUidSendDate">
+            <index-column name="APP_UID"/>
+            <index-column name="APP_MSG_SEND_DATE"/>
+        </index>
     </table>
     <table name="APP_OWNER">
         <vendor type="mysql">
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 12c8d82c6..74f04c4cf 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -179,7 +179,8 @@ CREATE TABLE `APP_MESSAGE`
 	KEY `INDEX_TAS_ID`(`TAS_ID`),
 	KEY `INDEX_APP_NUMBER`(`APP_NUMBER`),
 	KEY `INDEX_APP_MSG_TYPE_ID`(`APP_MSG_STATUS_ID`),
-	KEY `INDEX_APP_MSG_STATUS_ID`(`APP_MSG_STATUS_ID`)
+	KEY `INDEX_APP_MSG_STATUS_ID`(`APP_MSG_STATUS_ID`),
+	KEY `indexAppUidSendDate`(`APP_UID`, `APP_MSG_SEND_DATE`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
 #-----------------------------------------------------------------------------
 #-- APP_OWNER
diff --git a/workflow/engine/js/src/PM.js b/workflow/engine/js/src/PM.js
index ce6fd0e51..b4c784512 100644
--- a/workflow/engine/js/src/PM.js
+++ b/workflow/engine/js/src/PM.js
@@ -3,3 +3,11 @@ var PM = PM || {};
     PM.version = '3.0.1.8';
 }());
 
+// Overwrite the global ajax timeout
+try {
+    if (parent.ext_ajax_timeout) {
+        Ext.Ajax.timeout = parent.ext_ajax_timeout;
+    }
+} catch (error) {
+    // Nothing to_do
+}
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index ba8cfac39..24cd7b6d7 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -81,7 +81,8 @@ class System
         'pmftotalcalculation_floating_point_number' => 10,
         'report_table_batch_regeneration' => 1000,
         'report_table_floating_number' => 4,
-        'report_table_double_number' => 4
+        'report_table_double_number' => 4,
+        'ext_ajax_timeout' => 600000
     ];
 
     /**
diff --git a/workflow/engine/templates/setup/languages.js b/workflow/engine/templates/setup/languages.js
index 526fd2e65..2ab7259c4 100644
--- a/workflow/engine/templates/setup/languages.js
+++ b/workflow/engine/templates/setup/languages.js
@@ -24,7 +24,6 @@ var removeOption;
 var installOption;
 var exportOption;
 
-Ext.Ajax.timeout = 300000;
 Ext.onReady(function(){
   
   //Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
diff --git a/workflow/engine/templates/setup/newSite.js b/workflow/engine/templates/setup/newSite.js
index 3a251f5e4..f2a0d0334 100644
--- a/workflow/engine/templates/setup/newSite.js
+++ b/workflow/engine/templates/setup/newSite.js
@@ -3,7 +3,6 @@
  * Jan 15th, 2011
  */
 
-Ext.Ajax.timeout = 300000;
 
 Ext.onReady(function(){
     var fieldNameWS,
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 019571513..f67283603 100644
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -334,6 +334,7 @@ define('DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION', $config['disable_downloa
 define('LOGS_MAX_FILES', $config['logs_max_files']);
 define('LOGS_LOCATION', $config['logs_location']);
 define('LOGGING_LEVEL', $config['logging_level']);
+define('EXT_AJAX_TIMEOUT', $config['ext_ajax_timeout']);
 define('TIME_ZONE', ini_get('date.timezone'));
 /*----------------------------------********---------------------------------*/
 define('HIGHLIGHT_HOME_FOLDER_ENABLE', $config['highlight_home_folder_enable'] === "1");