diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index ae630da4f..94d9cffbf 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -35,7 +35,6 @@ dependencies {
     compile 'com.cocosw:bottomsheet:1.3.1@aar'
 
     // RecyclerView
-    compile 'com.tonicartos:superslim:0.4.13'
     compile 'eu.davidea:flexible-adapter:5.0.5'
     compile 'eu.davidea:flexible-adapter-ui:1.0.0-b5'
     compile 'eu.davidea:flexible-adapter-livedata:1.0.0-b2'
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
index 4092453c7..da0ebf658 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
@@ -25,11 +25,11 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.tonicartos.superslim.LayoutManager;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.SubLogEntryParcel;
@@ -79,7 +79,7 @@ public class LogDisplayFragment extends RecyclerFragment<NestedLogAdapter>
         adapter.setListener(this);
         setAdapter(adapter);
 
-        setLayoutManager(new LayoutManager(getContext()));
+        setLayoutManager(new LinearLayoutManager(getContext()));
     }
 
     @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/NestedLogAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/NestedLogAdapter.java
index 756b19ae3..af50a1dbd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/NestedLogAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/NestedLogAdapter.java
@@ -17,6 +17,10 @@
 
 package org.sufficientlysecure.keychain.ui.adapter;
 
+
+import java.util.ArrayList;
+import java.util.List;
+
 import android.content.Context;
 import android.graphics.Color;
 import android.support.v4.content.ContextCompat;
@@ -29,15 +33,10 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.tonicartos.superslim.LayoutManager;
-
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class NestedLogAdapter extends RecyclerView.Adapter<NestedLogAdapter.LogEntryViewHolder> {
     private static final int ENTRY_TYPE_REGULAR = 0;
     private static final int ENTRY_TYPE_SUBLOG = 1;
@@ -135,14 +134,7 @@ public class NestedLogAdapter extends RecyclerView.Adapter<NestedLogAdapter.LogE
 
     @Override
     public void onBindViewHolder(LogEntryViewHolder holder, int position) {
-        LayoutManager.LayoutParams layoutParams = LayoutManager.LayoutParams
-                .from(holder.itemView.getLayoutParams());
-
-        layoutParams.isHeader = isSection(position);
-        layoutParams.setFirstPosition(getFirstSectionPosition(position));
-
         holder.bind(getItem(position), mIndentFactor);
-        holder.itemView.setLayoutParams(layoutParams);
     }
 
     class LogEntryViewHolder extends RecyclerView.ViewHolder {