diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java
index d8af8a354..e1748a0bc 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java
@@ -23,7 +23,7 @@ class ThreadScrollListener<I extends ThreadItem>
 	private final ThreadListController<?, I> controller;
 	private final UnreadMessageButton upButton, downButton;
 
-	protected ThreadScrollListener(ThreadItemAdapter<I> adapter,
+	ThreadScrollListener(ThreadItemAdapter<I> adapter,
 			ThreadListController<?, I> controller,
 			UnreadMessageButton upButton,
 			UnreadMessageButton downButton) {
@@ -57,7 +57,7 @@ class ThreadScrollListener<I extends ThreadItem>
 
 	private void updateUnreadButtons(int firstVisible, int lastVisible,
 			int count) {
-		if (firstVisible == NO_POSITION && lastVisible == NO_POSITION) {
+		if (firstVisible == NO_POSITION || lastVisible == NO_POSITION) {
 			setUnreadButtons(0, 0);
 			return;
 		}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java
index 73686d601..a80876e6a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewScrollListener.java
@@ -46,8 +46,10 @@ public abstract class BriarRecyclerViewScrollListener<A extends ItemReturningAda
 	@CallSuper
 	protected void onItemsVisible(int firstVisible, int lastVisible,
 			int itemCount) {
-		for (int i = firstVisible; i <= lastVisible; i++) {
-			onItemVisible(i);
+		if (firstVisible != NO_POSITION && lastVisible != NO_POSITION) {
+			for (int i = firstVisible; i <= lastVisible; i++) {
+				onItemVisible(i);
+			}
 		}
 	}