diff --git a/package.json b/package.json
index 32055a1f5c..b539a32d3e 100644
--- a/package.json
+++ b/package.json
@@ -28,12 +28,12 @@
     "highlight.js": "^8.9.1",
     "linkifyjs": "^2.0.0-beta.4",
     "marked": "^0.3.5",
-    "matrix-js-sdk": "^0.4.1",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^0.14.2",
     "react-dom": "^0.14.2",
-    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#3ee2648",
+    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#8c29605",
     "sanitize-html": "^1.11.1",
     "velocity-animate": "^1.2.3",
     "velocity-ui-pack": "^1.2.2"
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index d2afff13e7..3f934ce34e 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -28,7 +28,7 @@ var ObjectUtils = require('../../ObjectUtils');
 
 var PAGINATE_SIZE = 20;
 var INITIAL_SIZE = 20;
-var TIMELINE_CAP = 250; // the most events to show in a timeline
+var TIMELINE_CAP = 500; // the most events to show in a timeline
 
 // consider that the user remains "active" for this many milliseconds after a
 // user_activity event (and thus don't make the read-marker visible on new