diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt
index efc1eece..3a1458a9 100644
--- a/data/src/main/java/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/repository/MessageRepositoryImpl.kt
@@ -47,7 +47,11 @@ import model.Message
 import model.MmsPart
 import util.MessageUtils
 import util.Preferences
-import util.extensions.*
+import util.extensions.asFlowable
+import util.extensions.asMaybe
+import util.extensions.asObservable
+import util.extensions.insertOrUpdate
+import util.extensions.map
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/presentation/src/main/java/common/MenuItemAdapter.kt b/presentation/src/main/java/common/MenuItemAdapter.kt
index 690d373b..306afc95 100644
--- a/presentation/src/main/java/common/MenuItemAdapter.kt
+++ b/presentation/src/main/java/common/MenuItemAdapter.kt
@@ -25,6 +25,8 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.jakewharton.rxbinding2.view.clicks
 import com.moez.QKSMS.R
+import common.base.QkAdapter
+import common.base.QkViewHolder
 import common.util.Colors
 import common.util.extensions.setTint
 import common.util.extensions.setVisible
@@ -33,8 +35,6 @@ import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.menu_list_item.view.*
-import common.base.QkAdapter
-import common.base.QkViewHolder
 import javax.inject.Inject
 
 data class MenuItem(val title: String, val actionId: Int)
diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt
index 18cd46f7..91c3a1aa 100644
--- a/presentation/src/main/java/common/Navigator.kt
+++ b/presentation/src/main/java/common/Navigator.kt
@@ -30,7 +30,6 @@ import android.provider.ContactsContract
 import android.provider.Settings
 import android.provider.Telephony
 import android.view.View
-import manager.NotificationManager
 import feature.blocked.BlockedActivity
 import feature.blocked.BlockedViewModel
 import feature.compose.ComposeActivity
@@ -50,6 +49,7 @@ import feature.setup.SetupActivity
 import feature.setup.SetupViewModel
 import feature.themepicker.ThemePickerActivity
 import feature.themepicker.ThemePickerViewModel
+import manager.NotificationManager
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/presentation/src/main/java/common/base/QkActivity.kt b/presentation/src/main/java/common/base/QkActivity.kt
index c340372d..f0729cd5 100644
--- a/presentation/src/main/java/common/base/QkActivity.kt
+++ b/presentation/src/main/java/common/base/QkActivity.kt
@@ -24,10 +24,10 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
+import common.Navigator
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.toolbar.*
-import common.Navigator
 import kotlin.reflect.KClass
 
 abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
diff --git a/presentation/src/main/java/common/widget/AvatarView.kt b/presentation/src/main/java/common/widget/AvatarView.kt
index da0fbfaa..e1e0bd5e 100644
--- a/presentation/src/main/java/common/widget/AvatarView.kt
+++ b/presentation/src/main/java/common/widget/AvatarView.kt
@@ -29,13 +29,13 @@ import com.jakewharton.rxbinding2.view.clicks
 import com.moez.QKSMS.R
 import com.uber.autodispose.android.scope
 import com.uber.autodispose.kotlin.autoDisposable
-import injection.appComponent
+import common.Navigator
 import common.util.Colors
 import common.util.GlideApp
 import common.util.extensions.setTint
+import injection.appComponent
 import kotlinx.android.synthetic.main.avatar_view.view.*
 import model.Contact
-import common.Navigator
 import javax.inject.Inject
 
 class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
diff --git a/presentation/src/main/java/common/widget/MmsPreviewView.kt b/presentation/src/main/java/common/widget/MmsPreviewView.kt
index 98a9c927..67a40cc5 100644
--- a/presentation/src/main/java/common/widget/MmsPreviewView.kt
+++ b/presentation/src/main/java/common/widget/MmsPreviewView.kt
@@ -22,11 +22,11 @@ import android.content.Context
 import android.util.AttributeSet
 import android.widget.ImageView
 import android.widget.LinearLayout
-import injection.appComponent
+import common.Navigator
 import common.util.GlideApp
 import common.util.extensions.setVisible
+import injection.appComponent
 import model.MmsPart
-import common.Navigator
 import javax.inject.Inject
 
 class MmsPreviewView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
diff --git a/presentation/src/main/java/common/widget/PreferenceView.kt b/presentation/src/main/java/common/widget/PreferenceView.kt
index 319e0558..ec29e21e 100644
--- a/presentation/src/main/java/common/widget/PreferenceView.kt
+++ b/presentation/src/main/java/common/widget/PreferenceView.kt
@@ -27,11 +27,11 @@ import android.widget.TextView
 import com.moez.QKSMS.R
 import com.uber.autodispose.android.scope
 import com.uber.autodispose.kotlin.autoDisposable
-import injection.appComponent
 import common.util.Colors
 import common.util.extensions.getColorCompat
 import common.util.extensions.setTint
 import common.util.extensions.setVisible
+import injection.appComponent
 import kotlinx.android.synthetic.main.preference_view.view.*
 import javax.inject.Inject
 
diff --git a/presentation/src/main/java/common/widget/QkEditText.kt b/presentation/src/main/java/common/widget/QkEditText.kt
index 597a227b..ee5c1421 100644
--- a/presentation/src/main/java/common/widget/QkEditText.kt
+++ b/presentation/src/main/java/common/widget/QkEditText.kt
@@ -25,9 +25,9 @@ import android.widget.EditText
 import com.moez.QKSMS.R
 import com.uber.autodispose.android.scope
 import com.uber.autodispose.kotlin.autoDisposable
-import injection.appComponent
 import common.util.Colors
 import common.util.FontProvider
+import injection.appComponent
 import io.reactivex.Observable
 import javax.inject.Inject
 
diff --git a/presentation/src/main/java/common/widget/QkSwitch.kt b/presentation/src/main/java/common/widget/QkSwitch.kt
index ea7d1c3b..5b4b1f13 100644
--- a/presentation/src/main/java/common/widget/QkSwitch.kt
+++ b/presentation/src/main/java/common/widget/QkSwitch.kt
@@ -24,9 +24,9 @@ import android.support.v7.widget.SwitchCompat
 import android.util.AttributeSet
 import com.uber.autodispose.android.scope
 import com.uber.autodispose.kotlin.autoDisposable
-import injection.appComponent
 import common.util.Colors
 import common.util.extensions.withAlpha
+import injection.appComponent
 import io.reactivex.rxkotlin.Observables
 import javax.inject.Inject
 
diff --git a/presentation/src/main/java/common/widget/QkTextView.kt b/presentation/src/main/java/common/widget/QkTextView.kt
index 67e4ae75..5f80b0fb 100644
--- a/presentation/src/main/java/common/widget/QkTextView.kt
+++ b/presentation/src/main/java/common/widget/QkTextView.kt
@@ -23,10 +23,10 @@ import android.graphics.Typeface
 import android.support.text.emoji.widget.EmojiAppCompatTextView
 import android.util.AttributeSet
 import com.moez.QKSMS.R
-import injection.appComponent
 import common.util.Colors
 import common.util.FontProvider
 import common.util.extensions.getColorCompat
+import injection.appComponent
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import javax.inject.Inject
diff --git a/presentation/src/main/java/common/widget/Separator.kt b/presentation/src/main/java/common/widget/Separator.kt
index 2d602424..9cae9492 100644
--- a/presentation/src/main/java/common/widget/Separator.kt
+++ b/presentation/src/main/java/common/widget/Separator.kt
@@ -24,9 +24,9 @@ import android.view.View
 import com.moez.QKSMS.R
 import com.uber.autodispose.android.scope
 import com.uber.autodispose.kotlin.autoDisposable
-import injection.appComponent
 import common.util.Colors
 import common.util.extensions.getColorCompat
+import injection.appComponent
 import javax.inject.Inject
 
 class Separator @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : View(context, attrs) {