diff --git a/app/src/main/kotlin/org/fossify/messages/adapters/ThreadAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/ThreadAdapter.kt
index 88f4b15b..e1302894 100644
--- a/app/src/main/kotlin/org/fossify/messages/adapters/ThreadAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/messages/adapters/ThreadAdapter.kt
@@ -506,7 +506,11 @@ class ThreadAdapter(
     private fun setupDateTime(view: View, dateTime: ThreadDateTime) {
         ItemThreadDateTimeBinding.bind(view).apply {
             threadDateTime.apply {
-                text = dateTime.date.formatDateOrTime(context, hideTimeAtOtherDays = false, showYearEvenIfCurrent = false)
+                text = (dateTime.date * 1000L).formatDateOrTime(
+                    context = context,
+                    hideTimeOnOtherDays = false,
+                    showCurrentYear = false
+                )
                 setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
             }
             threadDateTime.setTextColor(textColor)
diff --git a/app/src/main/kotlin/org/fossify/messages/dialogs/InvalidNumberDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/InvalidNumberDialog.kt
index 34433d14..bb91ea55 100644
--- a/app/src/main/kotlin/org/fossify/messages/dialogs/InvalidNumberDialog.kt
+++ b/app/src/main/kotlin/org/fossify/messages/dialogs/InvalidNumberDialog.kt
@@ -12,7 +12,7 @@ class InvalidNumberDialog(val activity: BaseSimpleActivity, val text: String) {
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> { } }
+            .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> }
             .apply {
                 activity.setupDialogStuff(binding.root, this)
             }
diff --git a/app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt
index bb68f64a..45135f4d 100644
--- a/app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt
+++ b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt
@@ -155,7 +155,10 @@ class MessagesImporter(private val activity: SimpleActivity) {
                 refreshMessages()
             }
             when {
-                messagesFailed > 0 && messagesImported > 0 -> activity.toast(org.fossify.commons.R.string.importing_some_entries_failed)
+                messagesFailed > 0 && messagesImported > 0 -> {
+                    activity.toast(org.fossify.commons.R.string.importing_some_entries_failed)
+                }
+
                 messagesFailed > 0 -> activity.toast(org.fossify.commons.R.string.importing_failed)
                 else -> activity.toast(org.fossify.commons.R.string.importing_successful)
             }
@@ -212,7 +215,7 @@ class MessagesImporter(private val activity: SimpleActivity) {
 
     private fun isXmlMimeType(mimeType: String): Boolean {
         return mimeType.equals("application/xml", ignoreCase = true) || mimeType.equals(
-            "text/xml",
+            other = "text/xml",
             ignoreCase = true
         )
     }
diff --git a/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt
index c8c1c136..90b26d65 100644
--- a/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt
+++ b/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt
@@ -6,11 +6,20 @@ import android.os.Handler
 import android.os.Looper
 import com.bumptech.glide.Glide
 import com.klinker.android.send_message.MmsReceivedReceiver
-import org.fossify.commons.extensions.*
+import org.fossify.commons.extensions.baseConfig
+import org.fossify.commons.extensions.getMyContactsCursor
+import org.fossify.commons.extensions.isNumberBlocked
+import org.fossify.commons.extensions.normalizePhoneNumber
+import org.fossify.commons.extensions.showErrorToast
 import org.fossify.commons.helpers.SimpleContactsHelper
 import org.fossify.commons.helpers.ensureBackgroundThread
 import org.fossify.messages.R
-import org.fossify.messages.extensions.*
+import org.fossify.messages.extensions.conversationsDB
+import org.fossify.messages.extensions.getConversations
+import org.fossify.messages.extensions.getLatestMMS
+import org.fossify.messages.extensions.insertOrUpdateConversation
+import org.fossify.messages.extensions.showReceivedMessageNotification
+import org.fossify.messages.extensions.updateUnreadCountBadge
 import org.fossify.messages.helpers.ReceiverUtils.isMessageFilteredOut
 import org.fossify.messages.helpers.refreshMessages
 import org.fossify.messages.models.Message
@@ -43,7 +52,9 @@ class MmsReceiver : MmsReceivedReceiver() {
         }
     }
 
-    override fun onError(context: Context, error: String) = context.showErrorToast(context.getString(R.string.couldnt_download_mms))
+    override fun onError(context: Context, error: String) {
+        context.showErrorToast(context.getString(R.string.couldnt_download_mms))
+    }
 
     private fun handleMmsMessage(
         context: Context,
@@ -67,7 +78,13 @@ class MmsReceiver : MmsReceivedReceiver() {
         }
 
         Handler(Looper.getMainLooper()).post {
-            context.showReceivedMessageNotification(mms.id, address, mms.body, mms.threadId, glideBitmap)
+            context.showReceivedMessageNotification(
+                messageId = mms.id,
+                address = address,
+                body = mms.body,
+                threadId = mms.threadId,
+                bitmap = glideBitmap
+            )
             val conversation = context.getConversations(mms.threadId).firstOrNull() ?: return@post
             ensureBackgroundThread {
                 context.insertOrUpdateConversation(conversation)