diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
index 59f61dc4..0e539d54 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
@@ -27,7 +27,7 @@ import com.simplemobiletools.contacts.models.Contact
 import kotlinx.android.synthetic.main.item_contact_with_number.view.*
 import java.util.*
 
-class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Contact>, private val listener: RefreshContactsListener?,
+class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Contact>, private val listener: RefreshContactsListener?,
                       private val isFavoritesFragment: Boolean, recyclerView: MyRecyclerView, fastScroller: FastScroller, itemClick: (Any) -> Unit) :
         MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
 
@@ -66,6 +66,10 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
     }
 
     override fun actionItemPressed(id: Int) {
+        if (selectedPositions.isEmpty()) {
+            return
+        }
+
         when (id) {
             R.id.cab_edit -> editContact()
             R.id.cab_select_all -> selectAll()
@@ -97,7 +101,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
         contactDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_person, textColor)
     }
 
-    fun updateItems(newItems: MutableList<Contact>) {
+    fun updateItems(newItems: ArrayList<Contact>) {
         contactItems = newItems
         notifyDataSetChanged()
         finishActMode()
@@ -135,10 +139,6 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
     }
 
     private fun removeFavorites() {
-        if (selectedPositions.isEmpty()) {
-            return
-        }
-
         val favoritesToRemove = ArrayList<Contact>()
         selectedPositions.sortedDescending().forEach {
             favoritesToRemove.add(contactItems[it])
@@ -155,10 +155,6 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
     }
 
     private fun addToFavorites() {
-        if (selectedPositions.isEmpty()) {
-            return
-        }
-
         val newFavorites = ArrayList<Contact>()
         selectedPositions.forEach { newFavorites.add(contactItems[it]) }
         ContactsHelper(activity).addFavorites(newFavorites)
@@ -167,10 +163,6 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
     }
 
     private fun shareContacts() {
-        if (selectedPositions.isEmpty()) {
-            return
-        }
-
         val contacts = ArrayList<Contact>()
         selectedPositions.forEach {
             contacts.add(contactItems[it])
diff --git a/app/src/main/res/layout/dialog_export_contacts.xml b/app/src/main/res/layout/dialog_export_contacts.xml
index 0f053e06..e8bfc397 100644
--- a/app/src/main/res/layout/dialog_export_contacts.xml
+++ b/app/src/main/res/layout/dialog_export_contacts.xml
@@ -72,7 +72,7 @@
             android:clipToPadding="false"
             android:overScrollMode="never"
             android:paddingTop="@dimen/medium_margin"
-            app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>
+            app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/>
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_filter_contact_sources.xml b/app/src/main/res/layout/dialog_filter_contact_sources.xml
index 4264f88b..432d7ff3 100644
--- a/app/src/main/res/layout/dialog_filter_contact_sources.xml
+++ b/app/src/main/res/layout/dialog_filter_contact_sources.xml
@@ -8,4 +8,4 @@
     android:clipToPadding="false"
     android:overScrollMode="never"
     android:paddingTop="@dimen/medium_margin"
-    app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>
+    app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/>
diff --git a/app/src/main/res/layout/fragment_layout.xml b/app/src/main/res/layout/fragment_layout.xml
index 029e3861..55e0a9ae 100644
--- a/app/src/main/res/layout/fragment_layout.xml
+++ b/app/src/main/res/layout/fragment_layout.xml
@@ -40,7 +40,7 @@
             android:layout_height="match_parent"
             android:clipToPadding="false"
             android:scrollbars="none"
-            app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>
+            app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/>
 
         <com.simplemobiletools.commons.views.FastScroller
             android:id="@+id/fragment_fastscroller"
diff --git a/app/src/main/res/layout/layout_select_contact.xml b/app/src/main/res/layout/layout_select_contact.xml
index f904d1d1..d2dde128 100644
--- a/app/src/main/res/layout/layout_select_contact.xml
+++ b/app/src/main/res/layout/layout_select_contact.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:clipToPadding="false"
         android:scrollbars="none"
-        app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>
+        app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/>
 
     <com.simplemobiletools.commons.views.FastScroller
         android:id="@+id/select_contact_fastscroller"