diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
index 9c306061a..e0561ff31 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
@@ -1452,6 +1452,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                              inBuffer: s
                        changeDetected: &changeDetected
                   maxSyncResponseSize: maxSyncResponseSize];
+
+          if (maxSyncResponseSize > 0 && [s length] >= maxSyncResponseSize)
+            break;
         }
 
       if (changeDetected)
diff --git a/NEWS b/NEWS
index fd2f63b5e..992a01184 100644
--- a/NEWS
+++ b/NEWS
@@ -43,7 +43,7 @@ Bug fixes
  - Fix server side crash when reading some recurrence appointments (Zentyal)
  - Outlook clients can use reply all functionality on multidomain environment (Zentyal)
  - Optional attendes on events are now shown properly (Zentyal)
-
+ - fixed the EAS maximum response size being per-folder, and not global
 
 2.2.17a (2015-03-15)
 --------------------