diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 1b5b1300..e99d94dd 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -2104,6 +2104,8 @@ class BaresipService: Service() {
                 Log.d(TAG, "Removing Mobile account (role lost or SIM missing)")
                 existingMobileUa.remove()
                 Account.saveAccounts()
+                CallHistoryNew.save()
+                Message.save()
                 updateStatusNotification()
             }
             return
@@ -2132,6 +2134,8 @@ class BaresipService: Service() {
         uasStatus.value = UserAgent.statusMap()
 
         Account.saveAccounts()
+        CallHistoryNew.save()
+        Message.save()
         updateStatusNotification()
     }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
index 1c92b5b2..70443da4 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
@@ -165,6 +165,7 @@ import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import kotlin.time.Duration.Companion.milliseconds
 
 private val dialpadButtonEnabled = mutableStateOf(true)
 private var pullToRefreshEnabled = mutableStateOf(true)
@@ -396,7 +397,7 @@ private fun MainScreen(
         if (isConnected) {
             if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
                 call.focusDtmf.value = true
-                delay(300)
+                delay(300.milliseconds)
                 keyboardController?.show()
             }
             else
@@ -906,7 +907,7 @@ private fun MainContent(navController: NavController, viewModel: ViewModel, cont
 
     LaunchedEffect(isRefreshing) {
         if (isRefreshing) {
-            delay(1000)
+            delay(1000.milliseconds)
             isRefreshing = false
         }
     }
@@ -1456,7 +1457,7 @@ private fun CallTimer(
             val elapsedMillis = now - startTime
             val seconds = if (elapsedMillis > 0) elapsedMillis / 1000 else 0
             timeText = android.text.format.DateUtils.formatElapsedTime(seconds)
-            delay(1000L)
+            delay(1000L.milliseconds)
         }
     }
 
@@ -2778,7 +2779,7 @@ private fun acceptTransfer(ctx: Context, viewModel: ViewModel, ua: UserAgent, ca
 
 private fun backup(ctx: Context, password: String) {
     val files = arrayListOf("accounts", "config", "contacts", "call_history",
-        "messages", "uuid", "gzrtp.zid", "cert.pem", "ca_cert", "ca_certs.crt")
+        "messages", "uuid", "gzrtp.zid", "cert.pem", "ca_cert", "ca_certs.crt", "blocked.json")
     File(BaresipService.filesPath).walk().forEach {
         if (it.name.endsWith(".png"))
             files.add(it.name)