diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewBehavior.java b/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java
similarity index 64%
rename from briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewBehavior.java
rename to briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java
index 2f82d5d08..2eda0bbe7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerViewBehavior.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/SnackbarAwareBehavior.java
@@ -2,44 +2,43 @@ package org.briarproject.briar.android.view;
 
 import android.content.Context;
 import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.CoordinatorLayout.Behavior;
 import android.support.design.widget.CoordinatorLayout.LayoutParams;
-import android.support.design.widget.Snackbar;
+import android.support.design.widget.Snackbar.SnackbarLayout;
 import android.util.AttributeSet;
 import android.view.View;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
-public class BriarRecyclerViewBehavior
-		extends CoordinatorLayout.Behavior<BriarRecyclerView> {
+public class SnackbarAwareBehavior<V extends View> extends Behavior<V> {
 
-	public BriarRecyclerViewBehavior(Context context, AttributeSet attrs) {
+	public SnackbarAwareBehavior(Context context, AttributeSet attrs) {
 		super(context, attrs);
 	}
 
 	@Override
 	public boolean onDependentViewChanged(CoordinatorLayout parent,
-			BriarRecyclerView child, View snackbar) {
+			V child, View snackbar) {
 		setMargin(child, snackbar.getHeight());
 		return true;
 	}
 
 	@Override
 	public void onDependentViewRemoved(CoordinatorLayout parent,
-			BriarRecyclerView child, View snackbar) {
+			V child, View snackbar) {
 		setMargin(child, 0);
 	}
 
 	@Override
 	public boolean layoutDependsOn(CoordinatorLayout parent,
-			BriarRecyclerView child, View dependency) {
-		return dependency instanceof Snackbar.SnackbarLayout;
+			V child, View dependency) {
+		return dependency instanceof SnackbarLayout;
 	}
 
-	private void setMargin(View child, int margin) {
+	private void setMargin(V child, int margin) {
 		LayoutParams params = (LayoutParams) child.getLayoutParams();
 		params.setMargins(0, 0, 0, margin);
 		child.setLayoutParams(params);
 	}
-
 }
diff --git a/briar-android/src/main/res/layout/fragment_contact_list.xml b/briar-android/src/main/res/layout/fragment_contact_list.xml
index 824d3cba3..646c7d506 100644
--- a/briar-android/src/main/res/layout/fragment_contact_list.xml
+++ b/briar-android/src/main/res/layout/fragment_contact_list.xml
@@ -9,7 +9,7 @@
 		android:id="@+id/list"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		app:layout_behavior="org.briarproject.briar.android.view.BriarRecyclerViewBehavior"
+		app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior"
 		app:scrollToEnd="false"/>
 
 	<io.github.kobakei.materialfabspeeddial.FabSpeedDial
@@ -22,6 +22,6 @@
 		app:fab_miniFabTextBackground="@color/briar_accent"
 		app:fab_miniFabTextColor="@android:color/white"
 		app:layout_anchorGravity="bottom|right|end"
-		app:layout_behavior="io.github.kobakei.materialfabspeeddial.FabSpeedDial$Behavior"/>
+		app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior"/>
 
 </android.support.design.widget.CoordinatorLayout>