diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 8bdc3d1..1232700 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,21 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-08-12T16:05:44.300902100Z">
+        <DropdownSelection timestamp="2024-08-21T14:56:14.250888900Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\28180\.android\avd\Galaxy_watch_6.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\28180\.android\avd\Galaxy_watch_6_API_33.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+      <SelectionState runConfigName="SplashChatScreenPreview">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-08-21T16:55:29.813086700Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\28180\.android\avd\Galaxy_watch_6_API_33.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5073add..efcbaf7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,7 +21,7 @@ android {
         //noinspection OldTargetApi
         targetSdk = 34
         versionCode = 1
-        versionName = "1.0.6"
+        versionName = "1.0.7"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -107,7 +107,6 @@ dependencies {
     implementation(libs.androidx.material3)
     implementation(libs.coil.compose)
     implementation(libs.androidx.compose.foundation)
-    implementation(libs.zoomable)
     implementation(libs.gson)
     testImplementation(libs.junit)
     implementation(libs.zxing.core)
diff --git a/app/src/main/java/com/gohj99/telewatch/AboutActivity.kt b/app/src/main/java/com/gohj99/telewatch/AboutActivity.kt
index 42843cd..f9a69e8 100644
--- a/app/src/main/java/com/gohj99/telewatch/AboutActivity.kt
+++ b/app/src/main/java/com/gohj99/telewatch/AboutActivity.kt
@@ -82,7 +82,7 @@ fun SplashAboutScreen(appVersion: String, buildDate: String) {
     Column(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 25.dp)
+            .padding(top = 20.dp)
             .background(Color.Black),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center
@@ -139,7 +139,7 @@ fun SplashAboutScreen(appVersion: String, buildDate: String) {
             textAlign = TextAlign.Center
         )
 
-        Spacer(modifier = Modifier.height(8.dp))
+        Spacer(modifier = Modifier.height(12.dp))
 
         Text(
             text = stringResource(id = R.string.Build_Date) + " $buildDate",
diff --git a/app/src/main/java/com/gohj99/telewatch/ChatActivity.kt b/app/src/main/java/com/gohj99/telewatch/ChatActivity.kt
index f8b4e62..740e1e2 100644
--- a/app/src/main/java/com/gohj99/telewatch/ChatActivity.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ChatActivity.kt
@@ -68,7 +68,15 @@ class ChatActivity : ComponentActivity() {
                 SplashChatScreen(
                     chatTitle = chat!!.title,
                     chatList = chatList,
+                    chatId = chat!!.id,
                     currentUserId = currentUserId.value,
+                    goToChat = { chat ->
+                        startActivity(
+                            Intent(this@ChatActivity, ChatActivity::class.java).apply {
+                                putExtra("chat", chat)
+                            }
+                        )
+                    },
                     sendCallback = { messageText ->
                         tgApi?.sendMessage(
                             chatId = chat!!.id,
diff --git a/app/src/main/java/com/gohj99/telewatch/ImgViewActivity.kt b/app/src/main/java/com/gohj99/telewatch/ImgViewActivity.kt
index 57fd98d..4af5dc5 100644
--- a/app/src/main/java/com/gohj99/telewatch/ImgViewActivity.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ImgViewActivity.kt
@@ -8,7 +8,17 @@
 
 package com.gohj99.telewatch
 
+import android.content.ContentValues
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.os.Build
 import android.os.Bundle
+import android.os.Environment
+import android.provider.MediaStore
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -42,6 +52,7 @@ import net.engawapg.lib.zoomable.rememberZoomState
 import net.engawapg.lib.zoomable.zoomable
 import org.drinkless.td.libcore.telegram.TdApi
 import java.io.File
+import java.io.FileOutputStream
 
 class ImgViewActivity : ComponentActivity() {
     private var tgApi: TgApi? = null
@@ -132,7 +143,9 @@ class ImgViewActivity : ComponentActivity() {
     private fun showImage(photoPath: String) {
         setContent {
             TelewatchTheme {
-                SplashImgView(photoPath)
+                SplashImgView(photoPath, {
+                    Toast.makeText(this, saveImageToExternalStorage(this, photoPath), Toast.LENGTH_SHORT).show()
+                })
             }
         }
     }
@@ -157,8 +170,73 @@ class ImgViewActivity : ComponentActivity() {
     }
 }
 
+fun saveImageToExternalStorage(context: Context, photoPath: String): String {
+    // 获取图片文件名
+    val imageName = File(photoPath).nameWithoutExtension
+
+    // 从内部存储读取图片
+    val bitmap = BitmapFactory.decodeFile(photoPath) ?: return context.getString(R.string.Read_failed)
+
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        // Android 10及以上使用MediaStore
+        val selection = "${MediaStore.Images.Media.DISPLAY_NAME} = ?"
+        val selectionArgs = arrayOf("$imageName.jpg")
+        val queryUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+        val cursor = context.contentResolver.query(queryUri, null, selection, selectionArgs, null)
+
+        if (cursor != null && cursor.count > 0) {
+            cursor.close()
+            return context.getString(R.string.Same_name_image_exists)
+        }
+        cursor?.close()
+
+        val contentValues = ContentValues().apply {
+            put(MediaStore.Images.Media.DISPLAY_NAME, "$imageName.jpg")
+            put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
+            put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_PICTURES + "/Telewatch")
+            put(MediaStore.Images.Media.IS_PENDING, 1) // 设置IS_PENDING状态
+        }
+
+        val uri = context.contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
+            ?: return context.getString(R.string.failling)
+
+        context.contentResolver.openOutputStream(uri)?.use { outputStream ->
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream)
+            outputStream.flush()
+        }
+
+        // 更新IS_PENDING状态
+        contentValues.clear()
+        contentValues.put(MediaStore.Images.Media.IS_PENDING, 0)
+        context.contentResolver.update(uri, contentValues, null, null)
+
+        return uri.toString()
+    } else {
+        // Android 8和9使用传统方式保存到外部存储
+        val imagesDir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), "Telewatch")
+        if (!imagesDir.exists()) {
+            imagesDir.mkdirs()
+        }
+
+        val file = File(imagesDir, "$imageName.jpg")
+
+        if (file.exists()) {
+            return context.getString(R.string.Same_name_image_exists)
+        }
+
+        FileOutputStream(file).use { outputStream ->
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream)
+        }
+
+        // 通知系统图库更新
+        context.sendBroadcast(Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(file)))
+
+        return file.absolutePath
+    }
+}
+
 @Composable
-private fun SplashImgView(photoPath: String) {
+private fun SplashImgView(photoPath: String, saveImage: () -> Unit) {
     Box(
         modifier = Modifier
             .padding(16.dp)
@@ -169,7 +247,13 @@ private fun SplashImgView(photoPath: String) {
         Image(
             painter = rememberAsyncImagePainter(model = photoPath),
             contentDescription = null,
-            modifier = Modifier.zoomable(rememberZoomState()),
+            modifier = Modifier
+                .zoomable(
+                    zoomState = rememberZoomState(),
+                    onLongPress = {
+                        saveImage()
+                    }
+                ),
         )
     }
 }
diff --git a/app/src/main/java/com/gohj99/telewatch/MainActivity.kt b/app/src/main/java/com/gohj99/telewatch/MainActivity.kt
index d57f492..e4c7a2d 100644
--- a/app/src/main/java/com/gohj99/telewatch/MainActivity.kt
+++ b/app/src/main/java/com/gohj99/telewatch/MainActivity.kt
@@ -95,9 +95,7 @@ class MainActivity : ComponentActivity() {
                     this@MainActivity,
                     chatsList = chatsList
                 )
-                TgApiManager.tgApi?.getChats(
-                    limit = 10
-                )
+                TgApiManager.tgApi?.loadChats(15)
                 launch(Dispatchers.Main) {
                     setContent {
                         TelewatchTheme {
diff --git a/app/src/main/java/com/gohj99/telewatch/telegram/TgApi.kt b/app/src/main/java/com/gohj99/telewatch/telegram/TgApi.kt
index ef66f57..74e9ce3 100644
--- a/app/src/main/java/com/gohj99/telewatch/telegram/TgApi.kt
+++ b/app/src/main/java/com/gohj99/telewatch/telegram/TgApi.kt
@@ -91,6 +91,7 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
             TdApi.UpdateMessageContent.CONSTRUCTOR -> handleMessageContentUpdate(update as TdApi.UpdateMessageContent)
             TdApi.UpdateMessageEdited.CONSTRUCTOR -> handleMessageEdited(update as TdApi.UpdateMessageEdited)
             TdApi.UpdateDeleteMessages.CONSTRUCTOR -> handleDeleteMessages(update as TdApi.UpdateDeleteMessages)
+            TdApi.UpdateNewChat.CONSTRUCTOR -> handleNewChat(update as TdApi.UpdateNewChat)
             // 其他更新
             else -> {
                 //println("Received update: $update")
@@ -98,6 +99,7 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         }
     }
 
+    // 处理授权状态更新
     private fun handleAuthorizationState(update: TdApi.UpdateAuthorizationState) {
         val authorizationState = update.authorizationState
         when (authorizationState.constructor) {
@@ -125,6 +127,7 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         }
     }
 
+    // 处理删除消息
     private fun handleDeleteMessages(update: TdApi.UpdateDeleteMessages) {
         val chatId = update.chatId
         val messageIds = update.messageIds
@@ -142,30 +145,40 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
             }
             if (mutableChatListSize - mutableChatList.size <= 1) saveChatList.value =
                 mutableChatList
-        }
-
-        // 更新聊天列表（别看了，我没写好的）
-        /*CoroutineScope(Dispatchers.Main).launch {
-            chatsList.value = chatsList.value.toMutableList().apply {
-                // 从聊天列表中移除已删除的消息
-                removeAll { chat -> chat.id == chatId && chat.message.id in messageIds }
+            runBlocking {
+                reloadMessageById(messageIds[0])
             }
+        }
 
-            // 更新保存的聊天列表
-            if (chatId == saveChatId) {
-                saveChatList.value = saveChatList.value.toMutableList().apply {
-                    removeAll { it.id in messageIds }
+        // 更新聊天列表
+        CoroutineScope(Dispatchers.IO).launch {
+            val chatResult = sendRequest(TdApi.GetChat(chatId))
+            if (chatResult.constructor == TdApi.Chat.CONSTRUCTOR) {
+                withContext(Dispatchers.Main) {
+                    chatsList.value = chatsList.value.toMutableList().apply {
+                        // 查找现有的聊天并更新
+                        val existingChatIndex = indexOfFirst { it.id == chatId }
+                        if (existingChatIndex >= 0) {
+                            val updatedChat = get(existingChatIndex).copy(
+                                message = handleAllMessages((chatResult as TdApi.Chat).lastMessage)
+                            )
+                            removeAt(existingChatIndex)
+                            add(0, updatedChat)
+                        }
+                    }
                 }
             }
-        }*/
+        }
     }
 
+    // 处理获取到的新消息
     private fun handleNewMessage(update: TdApi.UpdateNewMessage) {
         val message = update.message
         println("New message received in chat ID ${message.chatId}\nmessageId ${message.id}")
         updateChatList(message)
     }
 
+    // 处理消息内容更新
     private fun updateChatList(message: TdApi.Message) {
         val chatId = message.chatId
         val newMessageText = handleAllMessages(message)
@@ -214,6 +227,7 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         }
     }
 
+    // 处理消息内容更新
     private fun handleMessageContentUpdate(update: TdApi.UpdateMessageContent) {
         val chatId = update.chatId
         val messageId = update.messageId
@@ -238,6 +252,7 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         }*/
     }
 
+    // 处理消息编辑
     private fun handleMessageEdited(update: TdApi.UpdateMessageEdited) {
         val chatId = update.chatId
         val messageId = update.messageId
@@ -276,29 +291,71 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
             }
         }
 
-        // 更新聊天列表（别看了，我没写好的）
-        /*CoroutineScope(Dispatchers.Main).launch {
-            chatsList.value = chatsList.value.toMutableList().apply {
-                val chatIndex = indexOfFirst { it.id == chatId }
-                if (chatIndex >= 0) {
-                    val updatedChat = get(chatIndex).copy(
-                        message = if (saveChatList.value.any { it.id == messageId }) {
-                            val editedMessage = saveChatList.value.first { it.id == messageId }
-                            if (editedMessage.content is TdApi.MessageText) {
-                                val newMessageText = if (editedMessage.content.text.text.length > 20) editedMessage.content.text.text.take(20) + "..." else editedMessage.content.text.text
-                                newMessageText
-                            } else context.getString(R.string.Unknown_Message)
-                        } else get(chatIndex).message
-                    )
-                    removeAt(chatIndex)
-                    add(0, updatedChat)
+        // 更新聊天列表
+        CoroutineScope(Dispatchers.IO).launch {
+            val chatResult = sendRequest(TdApi.GetChat(chatId))
+            if (chatResult.constructor == TdApi.Chat.CONSTRUCTOR) {
+                withContext(Dispatchers.Main) {
+                    chatsList.value = chatsList.value.toMutableList().apply {
+                        // 查找现有的聊天并更新
+                        val existingChatIndex = indexOfFirst { it.id == chatId }
+                        if (existingChatIndex >= 0) {
+                            val updatedChat = get(existingChatIndex).copy(
+                                message = handleAllMessages((chatResult as TdApi.Chat).lastMessage)
+                            )
+                            removeAt(existingChatIndex)
+                            add(0, updatedChat)
+                        }
+                    }
                 }
             }
-        }*/
+        }
+    }
+
+    // 处理新聊天
+    private fun handleNewChat(update: TdApi.UpdateNewChat){
+        //println(update)
+        val newChat = update.chat
+        val chatId = newChat.id
+        //println(newChat.lastMessage)
+        //println(newMessageText)
+
+        // 异步获取聊天标题
+        CoroutineScope(Dispatchers.IO).launch {
+            val chatResult = sendRequest(TdApi.GetChat(chatId))
+            if (chatResult.constructor == TdApi.Chat.CONSTRUCTOR) {
+                val chatTitle = (chatResult as TdApi.Chat).title
+                val lastMessage = handleAllMessages((chatResult.lastMessage))
+                withContext(Dispatchers.Main) {
+                    chatsList.value = chatsList.value.toMutableList().apply {
+                        // 查找现有的聊天并更新
+                        val existingChatIndex = indexOfFirst { it.id == chatId }
+                        if (existingChatIndex >= 0) {
+                            val updatedChat = get(existingChatIndex).copy(
+                                title = chatTitle,
+                                message = lastMessage
+                            )
+                            removeAt(existingChatIndex)
+                            add(0, updatedChat)
+                        } else {
+                            // 新增聊天到列表顶部
+                            add(
+                                Chat(
+                                    id = chatId,
+                                    title = chatTitle, // 使用从TdApi获取的标题
+                                    message = lastMessage
+                                )
+                            )
+                        }
+                    }
+                }
+            }
+        }
     }
 
     // 处理和简化消息
-    private fun handleAllMessages(message: TdApi.Message): String {
+    private fun handleAllMessages(message: TdApi.Message?): String {
+        if (message == null) return context.getString(R.string.Unknown_Message)
         return when (val content = message.content) {
             is TdApi.MessageText -> if (content.text.text.length > 20) content.text.text.take(20) + "..." else content.text.text
             is TdApi.MessagePhoto -> context.getString(R.string.Photo)
@@ -309,6 +366,7 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         }
     }
 
+    // 加载配置
     private fun loadConfig(context: Context): Properties {
         val properties = Properties()
         try {
@@ -321,6 +379,7 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         return properties
     }
 
+    // 获取应用版本
     private fun getAppVersion(context: Context): String {
         return try {
             val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
@@ -373,6 +432,19 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         }
     }
 
+    // 获取用户消息
+    fun getUser(userId: Long, onResult: (String) -> Unit) {
+        val getUserRequest = TdApi.GetUser(userId)
+
+        client.send(getUserRequest, { result ->
+            if (result is TdApi.User) {
+                val fullName = "${result.firstName} ${result.lastName}".trim()
+                onResult(fullName)
+            } else {
+                onResult("Unknown User")
+            }
+        })
+    }
 
     // 获取联系人
     fun getContacts(contacts: MutableState<List<Chat>>) {
@@ -413,6 +485,26 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         }
     }
 
+    // 标记已读
+    fun markMessagesAsRead(messageId: Long, messageThreadId: Long = 0L, forceRead: Boolean = false) {
+        // 创建 ViewMessages 请求
+        val viewMessagesRequest = TdApi.ViewMessages(
+            saveChatId,
+            messageThreadId,
+            longArrayOf(messageId),
+            forceRead
+        )
+
+        // 发送 ViewMessages 请求
+        client.send(viewMessagesRequest) { response ->
+            if (response is TdApi.Ok) {
+                println("Messages successfully marked as read in chat ID $saveChatId")
+            } else {
+                println("Failed to mark messages as read: $response")
+            }
+        }
+    }
+
     // 发送消息
     fun sendMessage(chatId: Long, messageText: String): TdApi.Message? {
         var sentMessage: TdApi.Message? = null
@@ -437,66 +529,11 @@ class TgApi(private val context: Context, private var chatsList: MutableState<Li
         return sentMessage
     }
 
-    // 获取聊天列表
-    suspend fun getChats(limit: Int = 10) {
-        var allChatsLoaded = false
-        while (!allChatsLoaded) {
-            allChatsLoaded = loadChats(limit)
-        }
-    }
-
     // 加载聊天列表
-    private suspend fun loadChats(limit: Int): Boolean = withContext(Dispatchers.IO) {
+    suspend fun loadChats(limit: Int = 15){
         val loadChats = TdApi.LoadChats(TdApi.ChatListMain(), limit)
         val result = sendRequest(loadChats)
-        return@withContext when (result.constructor) {
-            TdApi.Error.CONSTRUCTOR -> {
-                val error = result as TdApi.Error
-                println("Load Chats Error: ${error.message}")
-                true // 发生错误，停止加载
-            }
-            TdApi.Chats.CONSTRUCTOR -> {
-                val chats = result as TdApi.Chats
-                fetchChatDetails(chats.chatIds.toList())
-                chats.chatIds.isEmpty() // 如果获取的聊天ID为空，则表示所有聊天已加载完毕
-            }
-            else -> {
-                println("Unexpected result: $result")
-                true // 意外结果，停止加载
-            }
-        }
-    }
-
-    // 获取聊天详情
-    private suspend fun fetchChatDetails(chatIds: List<Long>) = withContext(Dispatchers.IO) {
-        for (chatId in chatIds) {
-            val result = sendRequest(TdApi.GetChat(chatId))
-            when (result.constructor) {
-                TdApi.Error.CONSTRUCTOR -> {
-                    val error = result as TdApi.Error
-                    println("Get Chat Details Error for chat ID $chatId: ${error.message}")
-                }
-                TdApi.Chat.CONSTRUCTOR -> {
-                    val chat = result as TdApi.Chat
-                    withContext(Dispatchers.Main) {
-                        val lastMessage = chat.lastMessage
-                        val message = if (lastMessage != null) {
-                            handleAllMessages(lastMessage)
-                        } else context.getString(R.string.Unknown_Message)
-                        chatsList.add(
-                            Chat(
-                                id = chat.id,
-                                title = chat.title,
-                                message = message
-                            )
-                        )
-                    }
-                }
-                else -> {
-                    println("Unexpected result for chat ID $chatId: $result")
-                }
-            }
-        }
+        //println("LoadChats result: $result")
     }
 
     // 根据消息id更新消息
diff --git a/app/src/main/java/com/gohj99/telewatch/ui/chat/ChatScreen.kt b/app/src/main/java/com/gohj99/telewatch/ui/chat/ChatScreen.kt
index 48652ff..beca9ac 100644
--- a/app/src/main/java/com/gohj99/telewatch/ui/chat/ChatScreen.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ui/chat/ChatScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -61,6 +62,7 @@ import androidx.compose.ui.unit.sp
 import coil.compose.rememberAsyncImagePainter
 import com.gohj99.telewatch.R
 import com.gohj99.telewatch.TgApiManager
+import com.gohj99.telewatch.ui.main.Chat
 import com.gohj99.telewatch.ui.theme.TelewatchTheme
 import com.gohj99.telewatch.ui.verticalRotaryScroll
 import kotlinx.coroutines.runBlocking
@@ -105,8 +107,10 @@ fun formatTimestampToDate(unixTimestamp: Int): String {
 fun SplashChatScreen(
     chatTitle: String,
     chatList: MutableState<List<TdApi.Message>>,
+    chatId: Long,
     currentUserId: Long,
     sendCallback: (String) -> Unit,
+    goToChat: (Chat) -> Unit,
     press: (TdApi.Message) -> Unit,
     longPress: suspend (String, TdApi.Message) -> String
 ) {
@@ -179,6 +183,8 @@ fun SplashChatScreen(
                     val alignment = if (isCurrentUser) Arrangement.End else Arrangement.Start
                     val modifier = if (isCurrentUser) Modifier.align(Alignment.End) else Modifier
 
+                    TgApiManager.tgApi?.markMessagesAsRead(message.id)
+
                     Column {
                         // 绘制日期
                         val nextItem = chatList.value.getOrNull(index + 1)
@@ -191,16 +197,53 @@ fun SplashChatScreen(
                             }
                         }
 
+                        // 渲染用户名字
+                        if (!isCurrentUser) {
+                            var senderName by remember {mutableStateOf("")}
+                            val senderId = message.senderId
+                            if (senderId.constructor == TdApi.MessageSenderUser.CONSTRUCTOR){
+                                val senderUser = senderId as TdApi.MessageSenderUser
+                                senderUser.userId.let {
+                                    Text(
+                                        text = senderName,
+                                        modifier = Modifier
+                                            .pointerInput(Unit) {
+                                                detectTapGestures(
+                                                    onTap = {
+                                                        if (senderUser.userId != chatId) {
+                                                            goToChat(Chat(
+                                                                id = senderUser.userId,
+                                                                title = senderName,
+                                                                message = ""
+                                                            ))
+                                                        }
+                                                    }
+                                                )
+                                            }
+                                            .padding(start = 12.dp),
+                                        color = Color.White,
+                                        fontSize = 12.sp,
+                                        fontWeight = FontWeight.Bold,
+                                    )
+                                    LaunchedEffect(message.senderId) {
+                                        TgApiManager.tgApi?.getUser(it) { user ->
+                                            senderName = user
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
                         Row(
                             modifier = Modifier
-                                .padding(6.dp)
+                                .padding(5.dp)
                                 .fillMaxWidth(),
                             horizontalArrangement = alignment
                         ) {
                             Box(
                                 modifier = Modifier
                                     .background(backgroundColor, shape = RoundedCornerShape(8.dp))
-                                    .padding(8.dp)
+                                    .padding(start = 8.dp, end = 8.dp, top = 6.dp, bottom = 1.dp)
                                     .pointerInput(Unit) {
                                         detectTapGestures(
                                             onLongPress = {
@@ -238,6 +281,9 @@ fun SplashChatScreen(
                                                     fontSize = 18.sp
                                                 )
                                             }
+                                        }
+                                        is TdApi.MessageVideo -> {
+
                                         }
                                         else -> {
                                             Text(
@@ -247,15 +293,35 @@ fun SplashChatScreen(
                                             )
                                         }
                                     }
-                                    Text(
-                                        text = if (message.editDate == 0) formatTimestampToTime(message.date)
-                                        else stringResource(id = R.string.edit) + "" + formatTimestampToTime(message.editDate),
-                                        modifier = modifier,
-                                        color = Color(0xFF6A86A3),
-                                        fontSize = 14.sp
-                                    )
+                                    Row(
+                                        modifier = modifier
+                                            .padding(top = 4.dp),
+                                        horizontalArrangement = Arrangement.SpaceBetween // 两端对齐
+                                    ) {
+                                        Text(
+                                            text = if (message.editDate == 0) formatTimestampToTime(message.date)
+                                            else stringResource(id = R.string.edit) + " " + formatTimestampToTime(message.editDate),
+                                            modifier = modifier,
+                                            color = Color(0xFF6A86A3),
+                                            fontSize = 13.sp
+                                        )
+                                        if (!isCurrentUser) {
+                                            val forwardInfo = message.forwardInfo
+                                            forwardInfo?.origin?.let {
+                                                val origin = forwardInfo.origin as TdApi.MessageForwardOriginChannel
+                                                Text(
+                                                    text = origin.authorSignature,
+                                                    color = Color(0xFF6A86A3),
+                                                    fontSize = 12.sp,
+                                                    modifier = Modifier
+                                                        .align(Alignment.CenterVertically)
+                                                        .weight(1f)
+                                                        .wrapContentWidth(Alignment.End) // 向右对齐
+                                                )
+                                            }
+                                        }
+                                    }
                                 }
-
                             }
                         }
                     }
@@ -470,7 +536,9 @@ fun SplashChatScreenPreview() {
         SplashChatScreen(
             chatTitle = "XCちゃん",
             chatList = sampleMessages,
+            chatId = 1L,
             currentUserId = 1L,
+            goToChat = { },
             sendCallback = { text ->
                 println(text)
             },
diff --git a/app/src/main/java/com/gohj99/telewatch/ui/chat/LongPressBox.kt b/app/src/main/java/com/gohj99/telewatch/ui/chat/LongPressBox.kt
index 91b5391..bb012a2 100644
--- a/app/src/main/java/com/gohj99/telewatch/ui/chat/LongPressBox.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ui/chat/LongPressBox.kt
@@ -1,5 +1,6 @@
 package com.gohj99.telewatch.ui.chat
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -25,10 +26,10 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
+import com.gohj99.telewatch.R
 import com.gohj99.telewatch.ui.main.MainCard
 import com.gohj99.telewatch.ui.theme.TelewatchTheme
 import kotlinx.coroutines.launch
-import com.gohj99.telewatch.R
 
 @Composable
 fun LongPressBox(
@@ -39,17 +40,19 @@ fun LongPressBox(
     var nowShow by remember { mutableStateOf("first") }
     var showText by remember { mutableStateOf("") }
 
-
     Dialog(onDismissRequest = {
         nowShow = "first"
         onDismiss()
     }) {
+        BackHandler(onBack = {
+            nowShow = "first"
+            onDismiss()
+        })
         when (nowShow) {
             "first" -> {
                 Box(
                     modifier = Modifier
-                        .fillMaxWidth()
-                        .fillMaxHeight()
+                        .fillMaxSize()
                         .background(Color.Black.copy(alpha = 0.8f), shape = RoundedCornerShape(8.dp))
                         .padding(16.dp),
                     contentAlignment = Alignment.Center
diff --git a/app/src/main/java/com/gohj99/telewatch/ui/main/ItemsLazyColumn.kt b/app/src/main/java/com/gohj99/telewatch/ui/main/ItemsLazyColumn.kt
index 32b1a19..00067b8 100644
--- a/app/src/main/java/com/gohj99/telewatch/ui/main/ItemsLazyColumn.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ui/main/ItemsLazyColumn.kt
@@ -20,10 +20,13 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import com.gohj99.telewatch.TgApiManager
 import com.gohj99.telewatch.ui.verticalRotaryScroll
 
 // 定义一个数据类
@@ -68,6 +71,15 @@ fun <T> MutableState<List<T>>.add(item: T) {
 fun ChatLazyColumn(itemsList: MutableState<List<Chat>>, callback: (Chat) -> Unit) {
     val listState = rememberLazyListState()
 
+    LaunchedEffect(listState) {
+        snapshotFlow { listState.firstVisibleItemIndex }
+            .collect { index ->
+                if (index >= itemsList.value.size - 5) {  // 检测是否到倒数第五项
+                    TgApiManager.tgApi?.loadChats(itemsList.value.size + 1)
+                }
+            }
+    }
+
     LazyColumn(
         state = listState,
         modifier = Modifier
@@ -75,6 +87,9 @@ fun ChatLazyColumn(itemsList: MutableState<List<Chat>>, callback: (Chat) -> Unit
             .padding(horizontal = 16.dp) // 只在左右添加 padding
             .verticalRotaryScroll(listState)
     ) {
+        item {
+            Spacer(modifier = Modifier.height(8.dp)) // 添加一个高度为 8dp 的 Spacer
+        }
         items(itemsList.value) { item ->
             ChatView(item, callback)
         }
@@ -94,6 +109,9 @@ fun ContactsLazyColumn(itemsList: List<Chat>, callback: (Chat) -> Unit) {
             .padding(horizontal = 16.dp) // 只在左右添加 padding
             .verticalRotaryScroll(listState)
     ) {
+        item {
+            Spacer(modifier = Modifier.height(8.dp)) // 添加一个高度为 8dp 的 Spacer
+        }
         items(itemsList) { item ->
             ChatView(item, callback)
         }
diff --git a/app/src/main/java/com/gohj99/telewatch/ui/main/MainScreen.kt b/app/src/main/java/com/gohj99/telewatch/ui/main/MainScreen.kt
index 54f3f5b..b72c2d7 100644
--- a/app/src/main/java/com/gohj99/telewatch/ui/main/MainScreen.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ui/main/MainScreen.kt
@@ -9,11 +9,7 @@
 package com.gohj99.telewatch.ui.main
 
 import android.annotation.SuppressLint
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.MutableTransitionState
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -75,7 +71,7 @@ fun MainScreen(
         Box(
             modifier = Modifier
                 .fillMaxWidth() // 只填充宽度
-                .padding(top = 16.dp) // 添加顶部填充
+                .padding(top = 14.dp) // 添加顶部填充
                 .clickable { showMenu = !showMenu } // 点击时切换显示状态
         ) {
             Row(
@@ -103,7 +99,7 @@ fun MainScreen(
             }
         }
 
-        Spacer(modifier = Modifier.height(10.dp)) // 添加间距
+        Spacer(modifier = Modifier.height(4.dp)) // 添加间距
 
         val transitionState = remember { MutableTransitionState(false) }
         transitionState.targetState = showMenu
diff --git a/app/src/main/java/com/gohj99/telewatch/ui/main/MenuScreen.kt b/app/src/main/java/com/gohj99/telewatch/ui/main/MenuScreen.kt
index 4d7aad1..03a1049 100644
--- a/app/src/main/java/com/gohj99/telewatch/ui/main/MenuScreen.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ui/main/MenuScreen.kt
@@ -32,6 +32,9 @@ fun MenuLazyColumn(allPages: List<String>, nowPage: (String) -> Unit) {
             .padding(horizontal = 16.dp) // 只在左右添加 padding
             .verticalRotaryScroll(listState)
     ) {
+        item {
+            Spacer(modifier = Modifier.height(12.dp)) // 添加一个高度为 12dp 的 Spacer
+        }
         items(allPages) { page ->
             MenuView(page, nowPage)
         }
diff --git a/app/src/main/java/com/gohj99/telewatch/ui/setting/SettingLazyColumn.kt b/app/src/main/java/com/gohj99/telewatch/ui/setting/SettingLazyColumn.kt
index 40d1144..123d17d 100644
--- a/app/src/main/java/com/gohj99/telewatch/ui/setting/SettingLazyColumn.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ui/setting/SettingLazyColumn.kt
@@ -40,6 +40,9 @@ fun SettingLazyColumn(
             .padding(horizontal = 16.dp)
             .verticalRotaryScroll(listState)
     ) {
+        item {
+            Spacer(modifier = Modifier.height(8.dp)) // 添加一个高度为 8dp 的 Spacer
+        }
         items(itemsList.value) { item ->
             SettingView(item, callback)
         }
diff --git a/app/src/main/java/com/gohj99/telewatch/ui/setting/SettingScreen.kt b/app/src/main/java/com/gohj99/telewatch/ui/setting/SettingScreen.kt
index b404f81..ef85c65 100644
--- a/app/src/main/java/com/gohj99/telewatch/ui/setting/SettingScreen.kt
+++ b/app/src/main/java/com/gohj99/telewatch/ui/setting/SettingScreen.kt
@@ -42,7 +42,7 @@ fun SplashSettingScreen(settings: MutableState<List<String>>, callback: (String)
         Box(
             modifier = Modifier
                 .fillMaxWidth() // 只填充宽度
-                .padding(top = 16.dp) // 添加顶部填充
+                .padding(top = 14.dp) // 添加顶部填充
         ) {
             Row(
                 modifier = Modifier
@@ -59,7 +59,7 @@ fun SplashSettingScreen(settings: MutableState<List<String>>, callback: (String)
             }
         }
 
-        Spacer(modifier = Modifier.height(10.dp)) // 添加间距
+        Spacer(modifier = Modifier.height(4.dp)) // 添加间距
 
         SettingLazyColumn(settings, callback)
     }
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1bda1d3..b009a43 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -18,7 +18,7 @@
     <string name="Password">输入密码</string>
     <string name="Password_Error">密码错误</string>
     <string name="OK" translatable="false">OK</string>
-    <string name="Done">继续</string>
+    <string name="Done">登录</string>
     <string name="scan_qr">扫描二维码</string>
     <string name="loading">加载中…</string>
     <string name="Request_error">加载失败</string>
@@ -41,7 +41,7 @@
     <string name="Voice">嗓音</string>
     <string name="Animation">动图</string>
     <string name="Error_ImgView">这不是图像，或者您无法下载图像</string>
-    <string name="edit">编辑</string>
+    <string name="edit">已编辑</string>
     <string name="ReloadMessage">重新加载消息</string>
     <string name="GetMessage">获取消息信息</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 627bd70..8a98c1b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,4 +52,7 @@
     <string name="edit">Edit</string>
     <string name="ReloadMessage">Reload message</string>
     <string name="GetMessage">Get message information</string>
+    <string name="Same_name_image_exists">Have the same picture</string>
+    <string name="failling">failling</string>
+    <string name="Read_failed">Read failed</string>
 </resources>
\ No newline at end of file