diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt
index b02d72ef..8ff39ac9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt
@@ -27,7 +27,7 @@ class DirectReplyReceiver : BroadcastReceiver() {
         val settings = context.getSendMessageSettings()
         if (address != null) {
             val availableSIMs = SubscriptionManager.from(context).activeSubscriptionInfoList
-            if (availableSIMs?.size ?: 0 > 1) {
+            if ((availableSIMs?.size ?: 0) > 1) {
                 val currentSIMCardIndex = context.config.getUseSIMIdAtNumber(address)
                 val wantedId = availableSIMs.getOrNull(currentSIMCardIndex)
                 if (wantedId != null) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt
index 3c58a135..7bdf38a6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsReceiver.kt
@@ -21,6 +21,7 @@ import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.extensions.*
 import com.simplemobiletools.smsmessenger.helpers.refreshMessages
 import com.simplemobiletools.smsmessenger.models.Message
+import kotlin.math.min
 
 class SmsReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
@@ -42,7 +43,7 @@ class SmsReceiver : BroadcastReceiver() {
                 subject = it.pseudoSubject
                 status = it.status
                 body += it.messageBody
-                date = Math.min(it.timestampMillis, System.currentTimeMillis())
+                date = min(it.timestampMillis, System.currentTimeMillis())
                 threadId = context.getThreadId(address)
             }