diff --git a/lib/client.js b/lib/client.js
index c847f0763..e66d25b51 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -2098,14 +2098,19 @@ MatrixClient.prototype.searchMessageText = function(opts, callback) {
 /**
  * Perform a server-side search.
  * @param {Object} opts
+ * @param {string} opts.next_batch the batch token to pass in the query string
  * @param {Object} opts.body the JSON object to pass to the request body.
  * @param {module:client.callback} callback Optional.
  * @return {module:client.Promise} Resolves: TODO
  * @return {module:http-api.MatrixError} Rejects: with an error response.
  */
 MatrixClient.prototype.search = function(opts, callback) {
+    var queryparams = {};
+    if (opts.next_batch) {
+        queryparams.next_batch = opts.next_batch;
+    }
     return this._http.authedRequest(
-        callback, "POST", "/search", undefined, opts.body
+        callback, "POST", "/search", queryparams, opts.body
     );
 };
 
diff --git a/lib/sync.js b/lib/sync.js
index cb91c46d4..f6a4d6f31 100644
--- a/lib/sync.js
+++ b/lib/sync.js
@@ -19,7 +19,7 @@ var Filter = require("./filter");
 // beyond that and wedge forever, so we need to track how long we are willing
 // to keep open the connection. This constant is *ADDED* to the timeout= value
 // to determine the max time we're willing to wait.
-var BUFFER_PERIOD_MS = 20 * 1000;
+var BUFFER_PERIOD_MS = 80 * 1000;
 
 function getFilterName(userId, suffix) {
     // scope this on the user ID because people may login on many accounts