diff --git a/src/org/thoughtcrime/securesms/ConversationAdapter.java b/src/org/thoughtcrime/securesms/ConversationAdapter.java
index 357e787d88..7eeaf6f3af 100644
--- a/src/org/thoughtcrime/securesms/ConversationAdapter.java
+++ b/src/org/thoughtcrime/securesms/ConversationAdapter.java
@@ -314,7 +314,7 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
     if (lastSeen <= 0)     return -1;
     if (!isActiveCursor()) return -1;
 
-    int count = getItemCount();
+    int count = getItemCount() - (hasHeaderView() ? 1 : 0) - (hasFooterView() ? 1 : 0);
 
     for (int i=0;i<count;i++) {
       MessageRecord messageRecord = getRecordForPositionOrThrow(i);