diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt
index f3c4fb5a66..b68a82b215 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt
@@ -64,7 +64,7 @@ fun ChatArchiveLayout(
       style = MaterialTheme.typography.h1
     )
 
-    SettingsSectionView(stringResource(R.string.chat_database_section)) {
+    SettingsSectionView(stringResource(R.string.chat_archive_section)) {
       SettingsActionItem(
         Icons.Outlined.IosShare,
         stringResource(R.string.save_archive),
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt
index e3d55c164b..8a23e304e8 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt
@@ -43,7 +43,7 @@ fun DatabaseView(
 ) {
   val context = LocalContext.current
   val progressIndicator = remember { mutableStateOf(false) }
-  val runChat = remember { mutableStateOf(false) }
+  val runChat = remember { mutableStateOf(m.chatRunning.value ?: true) }
   val prefs = m.controller.appPrefs
   val chatArchiveName = remember { mutableStateOf(prefs.chatArchiveName.get()) }
   val chatArchiveTime = remember { mutableStateOf(prefs.chatArchiveTime.get()) }
@@ -69,7 +69,7 @@ fun DatabaseView(
       chatArchiveName,
       chatArchiveTime,
       chatLastStart,
-      startChat = { startChat(m, runChat) },
+      startChat = { startChat(m, runChat, chatLastStart) },
       stopChatAlert = { stopChatAlert(m, runChat) },
       exportArchive = { exportArchive(context, m, progressIndicator, chatArchiveName, chatArchiveTime, chatArchiveFile, saveArchiveLauncher) },
       deleteChatAlert = { deleteChatAlert(m, progressIndicator) },
@@ -230,13 +230,15 @@ fun SettingsSectionFooter(text: String) {
   Text(text, color = HighOrLowlight, modifier = Modifier.padding(start = 16.dp, top = 5.dp).fillMaxWidth(0.9F), fontSize = 12.sp)
 }
 
-private fun startChat(m: ChatModel, runChat: MutableState<Boolean>) {
+private fun startChat(m: ChatModel, runChat: MutableState<Boolean>, chatLastStart: MutableState<Instant?>) {
   withApi {
     try {
       m.controller.apiStartChat()
       runChat.value = true
       m.chatRunning.value = true
-      m.controller.appPrefs.chatLastStart.set(Clock.System.now())
+      val ts = Clock.System.now()
+      m.controller.appPrefs.chatLastStart.set(ts)
+      chatLastStart.value = ts
     } catch (e: Error) {
       runChat.value = false
       AlertManager.shared.showAlertMsg(generalGetString(R.string.error_starting_chat), e.toString())
diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/android/app/src/main/res/values-ru/strings.xml
index 9df9a051a9..1d048026ad 100644
--- a/apps/android/app/src/main/res/values-ru/strings.xml
+++ b/apps/android/app/src/main/res/values-ru/strings.xml
@@ -479,6 +479,7 @@
 
     <!-- ChatArchiveView.kt -->
     <string name="chat_archive_header">Архив чата</string>
+    <string name="chat_archive_section">АРХИВ ЧАТА</string>
     <string name="save_archive">Сохранить архив</string>
     <string name="delete_archive">Удалить архив</string>
     <string name="archive_created_on_ts">Дата создания <xliff:g id="archive_ts">%1$s</xliff:g></string>
diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/android/app/src/main/res/values/strings.xml
index eb30fbb86c..bdcf8e66bb 100644
--- a/apps/android/app/src/main/res/values/strings.xml
+++ b/apps/android/app/src/main/res/values/strings.xml
@@ -481,6 +481,7 @@
 
   <!-- ChatArchiveView.kt -->
   <string name="chat_archive_header">Chat archive</string>
+  <string name="chat_archive_section">CHAT ARCHIVE</string>
   <string name="save_archive">Save archive</string>
   <string name="delete_archive">Delete archive</string>
   <string name="archive_created_on_ts">Created on <xliff:g id="archive_ts">%1$s</xliff:g></string>