diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle
index 6b085aaeb..046653798 100644
--- a/twidere.component.common/build.gradle
+++ b/twidere.component.common/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     apt 'com.bluelinelabs:logansquare-compiler:1.3.7'
     apt 'com.hannesdorfmann.parcelableplease:processor:1.0.2'
     apt 'com.github.mariotaku.ObjectCursor:processor:0.9.9'
-    compile 'com.android.support:support-annotations:24.1.1'
+    compile 'com.android.support:support-annotations:24.2.0'
     compile 'com.bluelinelabs:logansquare:1.3.7'
     compile 'com.github.mariotaku.RestFu:library:0.9.32'
     compile 'com.github.mariotaku.RestFu:oauth:0.9.32'
diff --git a/twidere/build.gradle b/twidere/build.gradle
index aa76423f2..2d37a326b 100644
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@@ -120,17 +120,17 @@ dependencies {
 
     testCompile 'junit:junit:4.12'
 
-    androidTestCompile 'com.android.support:support-annotations:24.1.1'
+    androidTestCompile 'com.android.support:support-annotations:24.2.0'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
 
     compile 'com.android.support:multidex:1.0.1'
-    compile 'com.android.support:support-v13:24.1.1'
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.android.support:cardview-v7:24.1.1'
-    compile 'com.android.support:recyclerview-v7:24.1.1'
-    compile 'com.android.support:preference-v7:24.1.1'
-    compile 'com.android.support:preference-v14:24.1.1'
+    compile 'com.android.support:support-v4:24.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'com.android.support:cardview-v7:24.2.0'
+    compile 'com.android.support:recyclerview-v7:24.2.0'
+    compile 'com.android.support:preference-v7:24.2.0'
+    compile 'com.android.support:preference-v14:24.2.0'
     compile 'com.twitter:twitter-text:1.13.0'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'
@@ -163,7 +163,7 @@ dependencies {
     compile 'com.github.mariotaku.MediaViewerLibrary:subsample-image-view:0.9.17'
     compile 'com.github.mariotaku.SQLiteQB:library:0.9.6'
     compile 'com.github.mariotaku.ObjectCursor:core:0.9.9'
-    compile 'com.github.mariotaku:MultiValueSwitch:0.9.6'
+    compile 'com.github.mariotaku:MultiValueSwitch:0.9.7'
     compile 'com.github.mariotaku:AbstractTask:0.9.4'
     compile 'com.github.mariotaku.CommonsLibrary:parcel:0.9.8'
     compile 'com.github.mariotaku.CommonsLibrary:io:0.9.8'
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.kt
index e545c199e..7ceaa5b54 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.kt
@@ -36,18 +36,16 @@ import org.mariotaku.twidere.adapter.iface.ILoadMoreSupportAdapter.IndicatorPosi
 abstract class AbsContentListRecyclerViewFragment<A : LoadMoreSupportAdapter<RecyclerView.ViewHolder>> : AbsContentRecyclerViewFragment<A, LinearLayoutManager>() {
 
     override fun createItemDecoration(context: Context,
-                                      recyclerView: RecyclerView, layoutManager: LinearLayoutManager): RecyclerView.ItemDecoration? {
+                                      recyclerView: RecyclerView,
+                                      layoutManager: LinearLayoutManager): RecyclerView.ItemDecoration? {
         return DividerItemDecoration(context, layoutManager.orientation)
     }
 
-
     override fun setLoadMoreIndicatorPosition(@IndicatorPosition position: Long) {
         val decor = itemDecoration
-        if (decor != null) {
-            if (decor is DividerItemDecoration) {
-                decor.setDecorationStart(if (position and ILoadMoreSupportAdapter.START != 0L) 1 else 0)
-                decor.setDecorationEndOffset(if (position and ILoadMoreSupportAdapter.END != 0L) 1 else 0)
-            }
+        if (decor is DividerItemDecoration) {
+            decor.setDecorationStart(if (position and ILoadMoreSupportAdapter.START != 0L) 1 else 0)
+            decor.setDecorationEndOffset(if (position and ILoadMoreSupportAdapter.END != 0L) 1 else 0)
         }
         super.setLoadMoreIndicatorPosition(position)
     }