From 470e760e424abc3c2964ab31cbf589348a640af4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Feb 2017 11:11:37 +0000
Subject: [PATCH] Fix timeline & notifs panel spuriously being empty

Only claim there's nothing to display once we've failed to back
paginate, otherwise we'll show the empty message instead of the
MessagePanel and therefore never try to back-paginate.
---
 src/components/structures/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 5c0a6159e56..cb42f701a33 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -993,7 +993,7 @@ var TimelinePanel = React.createClass({
             );
         }
 
-        if (this.state.events.length == 0) {
+        if (this.state.events.length == 0 && !this.state.canBackPaginate && this.props.empty) {
             return (
                     <div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
                         <div className="mx_RoomView_empty">{ this.props.empty }</div>