diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.java
deleted file mode 100644
index 9cfcd6429..000000000
--- a/twidere/src/main/java/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 				Twidere - Twitter client for Android
- * 
- *  Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.mariotaku.twidere.adapter;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentAccessor;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.view.ViewGroup;
-
-public abstract class SupportFixedFragmentStatePagerAdapter extends FragmentStatePagerAdapter {
-
-    public SupportFixedFragmentStatePagerAdapter(final FragmentManager fm) {
-        super(fm);
-    }
-
-    @Override
-    public Object instantiateItem(final ViewGroup container, final int position) {
-        final Fragment f = (Fragment) super.instantiateItem(container, position);
-        final Bundle savedFragmentState = f != null ? FragmentAccessor.getSavedFragmentState(f) : null;
-        if (savedFragmentState != null) {
-            savedFragmentState.setClassLoader(f.getClass().getClassLoader());
-        }
-        return f;
-    }
-
-}
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.kt
new file mode 100644
index 000000000..c621e8b16
--- /dev/null
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.kt
@@ -0,0 +1,37 @@
+/*
+ * 				Twidere - Twitter client for Android
+ * 
+ *  Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mariotaku.twidere.adapter
+
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentAccessor
+import android.support.v4.app.FragmentManager
+import android.support.v4.app.FragmentStatePagerAdapter
+import android.view.ViewGroup
+
+abstract class SupportFixedFragmentStatePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) {
+
+    override fun instantiateItem(container: ViewGroup, position: Int): Fragment {
+        val f = super.instantiateItem(container, position) as Fragment
+        val savedFragmentState = FragmentAccessor.getSavedFragmentState(f)
+        savedFragmentState?.classLoader = f.javaClass.classLoader
+        return f
+    }
+
+}
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
index b6b73abe9..ce02e6c84 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
@@ -42,6 +42,7 @@ import org.mariotaku.ktextension.rangeOfSize
 import org.mariotaku.twidere.BuildConfig
 import org.mariotaku.twidere.R
 import org.mariotaku.twidere.TwidereConstants
+import org.mariotaku.twidere.TwidereConstants.LOGTAG
 import org.mariotaku.twidere.adapter.ParcelableStatusesAdapter
 import org.mariotaku.twidere.adapter.decorator.DividerItemDecoration
 import org.mariotaku.twidere.adapter.iface.ILoadMoreSupportAdapter
diff --git a/twidere/src/main/res/layout/fragment_content_recyclerview.xml b/twidere/src/main/res/layout/fragment_content_recyclerview.xml
index 3623ecc56..8aa268154 100644
--- a/twidere/src/main/res/layout/fragment_content_recyclerview.xml
+++ b/twidere/src/main/res/layout/fragment_content_recyclerview.xml
@@ -16,26 +16,31 @@
   ~  You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<org.mariotaku.twidere.view.ExtendedSwipeRefreshLayout
-    android:id="@+id/swipeLayout"
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
-    <FrameLayout
+    <org.mariotaku.twidere.view.ExtendedSwipeRefreshLayout
+        android:id="@+id/swipeLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:fitsSystemWindows="true">
 
-        <include layout="@layout/layout_content_fragment_common"/>
-
-        <org.mariotaku.twidere.view.ExtendedRecyclerView
-            android:id="@+id/recyclerView"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:focusable="true"
-            android:scrollbars="vertical"/>
-    </FrameLayout>
-</org.mariotaku.twidere.view.ExtendedSwipeRefreshLayout>
\ No newline at end of file
+            android:layout_height="match_parent">
+
+            <include layout="@layout/layout_content_fragment_common"/>
+
+            <org.mariotaku.twidere.view.ExtendedRecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:focusable="true"
+                android:scrollbars="vertical"/>
+        </FrameLayout>
+    </org.mariotaku.twidere.view.ExtendedSwipeRefreshLayout>
+</FrameLayout>
\ No newline at end of file