diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/adapter/SectionCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/adapter/SectionCursorAdapter.java
index 2fe53652d..b2ce33581 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/adapter/SectionCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/adapter/SectionCursorAdapter.java
@@ -115,6 +115,16 @@ public abstract class SectionCursorAdapter<C extends CursorAdapter.AbstractCurso
      */
     protected abstract T getSectionFromCursor(C cursor) throws IllegalStateException;
 
+    /**
+     * Return the id of the item represented by the row the cursor
+     * is currently moved to.
+     * @param section The section item to get the id from
+     * @return The id of the dataset
+     */
+    public long getIdFromSection(T section) {
+        return section != null ? section.hashCode() : 0L;
+    }
+
     @Override
     public int getItemCount() {
         return super.getItemCount() + mSectionMap.size();
@@ -122,21 +132,13 @@ public abstract class SectionCursorAdapter<C extends CursorAdapter.AbstractCurso
 
     @Override
     public final long getItemId(int listPosition) {
-        /*
         int index = mSectionMap.indexOfKey(listPosition);
         if (index < 0) {
             int cursorPosition = getCursorPositionWithoutSections(listPosition);
             return super.getItemId(cursorPosition);
         } else {
             T section = mSectionMap.valueAt(index);
-            return section != null ? section.hashCode() : 0L;
-        } */
-
-        if (isSection(listPosition)) {
-            return RecyclerView.NO_ID;
-        } else {
-            int cursorPosition = getCursorPositionWithoutSections(listPosition);
-            return super.getItemId(cursorPosition);
+            return getIdFromSection(section);
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/fastscroll/FastScrollRecyclerView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/fastscroll/FastScrollRecyclerView.java
index 7b1c7a388..83b1835b1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/fastscroll/FastScrollRecyclerView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/fastscroll/FastScrollRecyclerView.java
@@ -112,10 +112,7 @@ public class FastScrollRecyclerView extends RecyclerView implements RecyclerView
         if (count > 0) {
             stopScroll();
 
-
             int pixelsToScroll = (int) (computeVerticalScrollRange() * fraction);
-            System.out.println("ScrollBy Fraction: " + fraction + ", Pixel: " + pixelsToScroll);
-
             scrollBy(0, pixelsToScroll);
         }
     }