diff --git a/src/org/thoughtcrime/securesms/ConversationAdapter.java b/src/org/thoughtcrime/securesms/ConversationAdapter.java
index c08f4fcd5..f87ca62bf 100644
--- a/src/org/thoughtcrime/securesms/ConversationAdapter.java
+++ b/src/org/thoughtcrime/securesms/ConversationAdapter.java
@@ -300,5 +300,10 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
     Cursor cursor = getCursorAtPositionOrThrow(position);
     viewHolder.setText(DateUtils.getRelativeDate(getContext(), locale, getMessageRecord(cursor).getDateReceived()));
   }
+
+  @Override
+  public boolean isActive() {
+    return isActiveCursor();
+  }
 }
 
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
index c723f1f9f..6820fb7cd 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
@@ -145,6 +145,11 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     return getHeaderString(position);
   }
 
+  @Override
+  public boolean isActive() {
+    return isActiveCursor();
+  }
+
   public Map<Long, String> getSelectedContacts() {
     return selectedContacts;
   }
diff --git a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java b/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
index da2c23e66..93bcc6f7f 100644
--- a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
+++ b/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
@@ -183,7 +183,7 @@ public abstract class CursorRecyclerViewAdapter<VH extends RecyclerView.ViewHold
     return cursor;
   }
 
-  private boolean isActiveCursor() {
+  protected boolean isActiveCursor() {
     return valid && cursor != null;
   }
 
diff --git a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
index c4bc881d7..4291a90c1 100644
--- a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
+++ b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
@@ -7,6 +7,7 @@ import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -19,6 +20,8 @@ import java.util.Map;
  */
 public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
 
+  private static final String TAG = StickyHeaderDecoration.class.getName();
+
   private final Map<Long, ViewHolder> headerCache;
   private final StickyHeaderAdapter   adapter;
   private final boolean               renderInline;
@@ -42,18 +45,22 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
     int position = parent.getChildAdapterPosition(view);
 
     int headerHeight = 0;
-    if (position != RecyclerView.NO_POSITION && hasHeader(parent, position)) {
-      View header = getHeader(parent, position).itemView;
+    if (position != RecyclerView.NO_POSITION && hasHeader(parent, adapter, position)) {
+      View header = getHeader(parent, adapter, position).itemView;
       headerHeight = getHeaderHeightForLayout(header);
     }
 
     outRect.set(0, headerHeight, 0, 0);
   }
 
-  private boolean hasHeader(RecyclerView parent, int adapterPos) {
+  private boolean hasHeader(RecyclerView parent, StickyHeaderAdapter adapter, int adapterPos) {
     boolean isReverse = isReverseLayout(parent);
-    if (isReverse && adapterPos == parent.getAdapter().getItemCount() - 1 ||
-        !isReverse && adapterPos == 0) {
+
+    if (!adapter.isActive()) {
+      return false;
+    }
+
+    if (isReverse && adapterPos == ((RecyclerView.Adapter)adapter).getItemCount() - 1 || !isReverse && adapterPos == 0) {
       return true;
     }
 
@@ -61,7 +68,7 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
     return adapter.getHeaderId(adapterPos) != adapter.getHeaderId(previous);
   }
 
-  private ViewHolder getHeader(RecyclerView parent, int position) {
+  private ViewHolder getHeader(RecyclerView parent, StickyHeaderAdapter adapter, int position) {
     final long key = adapter.getHeaderId(position);
 
     if (headerCache.containsKey(key)) {
@@ -102,8 +109,8 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
 
       final int adapterPos = parent.getChildAdapterPosition(child);
 
-      if (adapterPos != RecyclerView.NO_POSITION && (layoutPos == 0 || hasHeader(parent, adapterPos))) {
-        View header = getHeader(parent, adapterPos).itemView;
+      if (adapterPos != RecyclerView.NO_POSITION && ((layoutPos == 0 && adapter.isActive()) || hasHeader(parent, adapter, adapterPos))) {
+        View header = getHeader(parent, adapter, adapterPos).itemView;
         c.save();
         final int left = child.getLeft();
         final int top = getHeaderTop(parent, child, header, adapterPos, layoutPos);
@@ -129,7 +136,7 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
           long nextId = adapter.getHeaderId(adapterPosHere);
           if (nextId != currentId) {
             final View next = parent.getChildAt(translatedChildPosition(parent, i));
-            final int offset = getChildY(parent, next) - (headerHeight + getHeader(parent, adapterPosHere).itemView.getHeight());
+            final int offset = getChildY(parent, next) - (headerHeight + getHeader(parent, adapter, adapterPosHere).itemView.getHeight());
             if (offset < 0) {
               return offset;
             } else {
@@ -197,5 +204,7 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
      * @param position the header's item position
      */
     void onBindHeaderViewHolder(T viewHolder, int position);
+
+    boolean isActive();
   }
 }
\ No newline at end of file