diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess
index bebc78e..d551da6 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess
@@ -24,7 +24,7 @@ ProxyPass /SOGo/casProxy http://localhost/sogo-cgi-bin/cas-proxy-validate
 {
 if ($activeSync =~ m/^enabled|on|1|yes$/i){
     $OUT .=<<"HERE";
-ProxyPass /Microsoft-Server-ActiveSync http://127.0.0.1:$sogod{'TCPPort'}/SOGo/Microsoft-Server-ActiveSync retry=60 connectiontimeout=5 timeout=360
+ProxyPass /Microsoft-Server-ActiveSync http://127.0.0.1:$sogod{'TCPPort'}/SOGo/Microsoft-Server-ActiveSync retry=60 connectiontimeout=5 timeout=3600
 HERE
 }
 else {
diff --git a/root/etc/e-smith/templates/etc/sogo/sogo.conf/65ActiveSync b/root/etc/e-smith/templates/etc/sogo/sogo.conf/65ActiveSync
new file mode 100644
index 0000000..41b3748
--- /dev/null
+++ b/root/etc/e-smith/templates/etc/sogo/sogo.conf/65ActiveSync
@@ -0,0 +1,12 @@
+{
+
+  if (($sogod{'ActiveSync'} || 'disabled') eq 'enabled'){
+    $OUT .=<<'_EOF';
+        SOGoMaximumPingInterval = 3540;
+        SOGoMaximumSyncInterval = 3540;
+        SOGoInternalSyncInterval = 60;
+        WOWatchDogRequestTimeout = 3600;
+_EOF
+  }
+
+}