diff --git a/internal_packages/notifications/lib/activity-sidebar-long-poll-store.coffee b/internal_packages/notifications/lib/activity-sidebar-long-poll-store.coffee
index 211f36231..034d19871 100644
--- a/internal_packages/notifications/lib/activity-sidebar-long-poll-store.coffee
+++ b/internal_packages/notifications/lib/activity-sidebar-long-poll-store.coffee
@@ -3,6 +3,6 @@ NylasStore = require 'nylas-store'
 
 class AccountSidebarLongPollStore extends NylasStore
   constructor: ->
-    @listenTo Actions.longPollReceivedRawDeltasPing, => @trigger()
+    @listenTo Actions.longPollReceivedRawDeltasPing, (n) => @trigger(n)
 
 module.exports = new AccountSidebarLongPollStore()
diff --git a/internal_packages/notifications/lib/activity-sidebar.cjsx b/internal_packages/notifications/lib/activity-sidebar.cjsx
index de884da63..896d9d1a1 100644
--- a/internal_packages/notifications/lib/activity-sidebar.cjsx
+++ b/internal_packages/notifications/lib/activity-sidebar.cjsx
@@ -94,7 +94,7 @@ class ActivitySidebar extends React.Component
         <div className="progress-track">
           <div className="progress" style={width: "#{progress}%"}></div>
         </div>
-        <div className="inner">Syncing mail data...</div>
+        <div className="inner">Syncing mail data&hellip;</div>
       </div>
 
   _renderTaskActivityItems: =>
@@ -115,11 +115,11 @@ class ActivitySidebar extends React.Component
 
   _renderDeltaSyncActivityItem: =>
     <div className="item" key="delta-sync-item">
-      <div style={padding: "14px 7px 0 10px", float: "left"}>
+      <div style={padding: "8px 7px 0 10px", float: "left"}>
         <RetinaImg name="sending-spinner.gif" mode={RetinaImg.Mode.ContentPreserve} />
       </div>
       <div className="inner">
-        Getting your mail&hellip;this might take a while
+        Syncing mail data&hellip;
       </div>
     </div>
 
@@ -142,14 +142,17 @@ class ActivitySidebar extends React.Component
     tasks: TaskQueueStatusStore.queue()
     sync: NylasSyncStatusStore.state()
 
-  _onDeltaReceived: =>
+  _onDeltaReceived: (countDeltas) =>
+    tooSmallForNotification = countDeltas <= 10
+    return if tooSmallForNotification
+
     if @_timeoutId
       clearTimeout @_timeoutId
 
     @_timeoutId = setTimeout(( =>
       delete @_timeoutId
       @setState receivingDelta: false
-    ), 15000)
+    ), 30000)
 
     @setState receivingDelta: true
 
diff --git a/internal_packages/worker-sync/lib/nylas-sync-worker-pool.coffee b/internal_packages/worker-sync/lib/nylas-sync-worker-pool.coffee
index 6410c5b3a..ef542183c 100644
--- a/internal_packages/worker-sync/lib/nylas-sync-worker-pool.coffee
+++ b/internal_packages/worker-sync/lib/nylas-sync-worker-pool.coffee
@@ -64,7 +64,7 @@ class NylasSyncWorkerPool
 
   _handleDeltas: (deltas) ->
     Actions.longPollReceivedRawDeltas(deltas)
-    Actions.longPollReceivedRawDeltasPing()
+    Actions.longPollReceivedRawDeltasPing(deltas.length)
 
     # Create a (non-enumerable) reference from the attributes which we carry forward
     # back to their original deltas. This allows us to mark the deltas that the