diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
index 7d3ec20cd..7748c74a8 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
@@ -43,7 +43,9 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.retryWhen
 import kotlinx.coroutines.launch
+import java.io.IOException
 import javax.inject.Inject
 
 class OfflineFirstChatRepository @Inject constructor(
@@ -181,7 +183,6 @@ class OfflineFirstChatRepository @Inject constructor(
             if (newestMessageIdFromDb.toInt() != 0) {
                 val limit = getCappedMessagesAmountOfChatBlock(newestMessageIdFromDb)
 
-
                 val list = getMessagesBeforeAndEqual(
                     newestMessageIdFromDb,
                     internalConversationId,
@@ -340,7 +341,7 @@ class OfflineFirstChatRepository @Inject constructor(
         }
 
     private suspend fun handleNewAndTempMessages(
-        receivedChatMessages : List<ChatMessage>,
+        receivedChatMessages: List<ChatMessage>,
         lookIntoFuture: Boolean,
         showUnreadMessagesMarker: Boolean
     ) {
@@ -752,7 +753,6 @@ class OfflineFirstChatRepository @Inject constructor(
             it.map(ChatMessageEntity::asModel)
         }.first()
 
-
     private suspend fun showMessagesBefore(internalConversationId: String, messageId: Long, limit: Int) {
         suspend fun getMessagesBefore(
             messageId: Long,
@@ -819,29 +819,29 @@ class OfflineFirstChatRepository @Inject constructor(
 
             emit(Result.success(chatMessageModel))
         }
-        //     .retryWhen { cause, attempt ->
-        //     if (cause is IOException && attempt < 3) {
-        //         delay(2000)
-        //         return@retryWhen true
-        //     } else {
-        //         return@retryWhen false
-        //     }
-        // }
-        .catch { e ->
-            Log.e(TAG, "Error when sending message", e)
+            .retryWhen { cause, attempt ->
+                if (cause is IOException && attempt < SEND_MESSAGE_RETRY_ATTEMPTS) {
+                    delay(SEND_MESSAGE_RETRY_DELAY)
+                    return@retryWhen true
+                } else {
+                    return@retryWhen false
+                }
+            }
+            .catch { e ->
+                Log.e(TAG, "Error when sending message", e)
 
-            val failedMessage = chatDao.getTempMessageForConversation(internalConversationId, referenceId).first()
-            failedMessage.sendingFailed = true
-            chatDao.updateChatMessage(failedMessage)
+                val failedMessage = chatDao.getTempMessageForConversation(internalConversationId, referenceId).first()
+                failedMessage.sendingFailed = true
+                chatDao.updateChatMessage(failedMessage)
 
-            val failedMessageModel = failedMessage.asModel()
-            _removeMessageFlow.emit(failedMessageModel)
+                val failedMessageModel = failedMessage.asModel()
+                _removeMessageFlow.emit(failedMessageModel)
 
-            val tripleChatMessages = Triple(true, false, listOf(failedMessageModel))
-            _messageFlow.emit(tripleChatMessages)
+                val tripleChatMessages = Triple(true, false, listOf(failedMessageModel))
+                _messageFlow.emit(tripleChatMessages)
 
-            emit(Result.failure(e))
-        }
+                emit(Result.failure(e))
+            }
 
     override suspend fun resendChatMessage(
         credentials: String,
@@ -873,7 +873,6 @@ class OfflineFirstChatRepository @Inject constructor(
         )
     }
 
-
     override suspend fun editChatMessage(
         credentials: String,
         url: String,
@@ -897,12 +896,13 @@ class OfflineFirstChatRepository @Inject constructor(
     ): Flow<Boolean> =
         flow {
             try {
-                val messageToEdit = chatDao.getChatMessageForConversation(internalConversationId, message.jsonMessageId
-                    .toLong()).first()
+                val messageToEdit = chatDao.getChatMessageForConversation(
+                    internalConversationId, message.jsonMessageId
+                        .toLong()
+                ).first()
                 messageToEdit.message = editedMessageText
                 chatDao.upsertChatMessage(messageToEdit)
 
-
                 val editedMessageModel = messageToEdit.asModel()
                 _removeMessageFlow.emit(editedMessageModel)
 
@@ -938,7 +938,6 @@ class OfflineFirstChatRepository @Inject constructor(
                 }
             }
         }
-
     }
 
     override suspend fun deleteTempMessage(chatMessage: ChatMessage) {
@@ -1018,5 +1017,7 @@ class OfflineFirstChatRepository @Inject constructor(
         private const val DELAY_TO_ENSURE_MESSAGES_ARE_ADDED: Long = 100
         private const val DEFAULT_MESSAGES_LIMIT = 100
         private const val MILLIES = 1000
+        private const val SEND_MESSAGE_RETRY_ATTEMPTS = 3
+        private const val SEND_MESSAGE_RETRY_DELAY: Long = 2000
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/TempMessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/TempMessageActionsDialog.kt
index cdebbfdf4..a3403db46 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/TempMessageActionsDialog.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/TempMessageActionsDialog.kt
@@ -20,12 +20,12 @@ import com.nextcloud.talk.chat.ChatActivity
 import com.nextcloud.talk.chat.data.model.ChatMessage
 import com.nextcloud.talk.data.network.NetworkMonitor
 import com.nextcloud.talk.data.user.model.User
-import com.nextcloud.talk.databinding.DialogMessageActionsBinding
 import com.nextcloud.talk.databinding.DialogTempMessageActionsBinding
 import com.nextcloud.talk.models.domain.ConversationModel
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.DateUtils
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -68,7 +68,7 @@ class TempMessageActionsDialog(
 
     private fun initMenuItems() {
         this.lifecycleScope.launch {
-            initResendMessage(true)
+            initResendMessage(networkMonitor.isOnline.first())
             initMenuEditMessage(true)
             initMenuDeleteMessage(true)
         }
@@ -84,8 +84,6 @@ class TempMessageActionsDialog(
     private fun initResendMessage(visible: Boolean) {
         if (visible) {
             binding.menuResendMessage.setOnClickListener {
-
-
                 chatActivity.chatViewModel.resendMessage(
                     chatActivity.conversationUser!!.getCredentials(),
                     ApiUtils.getUrlForChat(
@@ -95,7 +93,6 @@ class TempMessageActionsDialog(
                     ),
                     message
                 )
-
                 dismiss()
             }
         }