diff --git a/app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt b/app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt
index a0f3705d0..2ec50f06b 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt
@@ -115,7 +115,7 @@ fun createOkHttpClient(
 ): OkHttpClient {
     val httpClient = OkHttpClient.Builder()
 
-    httpClient.retryOnConnectionFailure(true)
+    httpClient.retryOnConnectionFailure(false)
     httpClient.connectTimeout(300, TimeUnit.SECONDS)
     httpClient.readTimeout(300, TimeUnit.SECONDS)
     httpClient.writeTimeout(300, TimeUnit.SECONDS)
@@ -125,7 +125,6 @@ fun createOkHttpClient(
 
     // Trust own CA and all self-signed certs
     httpClient.sslSocketFactory(sslSocketFactory, magicTrustManager)
-    httpClient.retryOnConnectionFailure(true)
     httpClient.hostnameVerifier(magicTrustManager.getHostnameVerifier(OkHostnameVerifier.INSTANCE))
 
     if (SDK_INT == Build.VERSION_CODES.N) {
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/services/GlobalService.kt b/app/src/main/java/com/nextcloud/talk/newarch/services/GlobalService.kt
index 1da27c4fc..bd91266e2 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/services/GlobalService.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/services/GlobalService.kt
@@ -102,11 +102,10 @@ class GlobalService constructor(usersRepository: UsersRepository,
 
         chatMessage.let { chatMessage ->
             conversation?.let { conversation ->
-                val currentStatus = chatMessage.chatMessageStatus
-                applicationScope.launch {
-                    //messagesRepository.updateMessageStatus(ChatMessageStatus.PROCESSING.ordinal, conversation.databaseId!!, chatMessage.jsonMessageId!!)
-                }
                 currentUser?.let { user ->
+                    val currentStatus = chatMessage.chatMessageStatus
+                    messagesRepository.updateMessageStatus(ChatMessageStatus.PROCESSING.ordinal, conversation.databaseId!!, chatMessage.jsonMessageId!!)
+
                     if (chatMessage.internalConversationId == conversation.databaseId && conversation.databaseUserId == currentUser.id) {
                         val sendChatMessageUseCase = SendChatMessageUseCase(networkComponents.getRepository(false, user), ApiErrorHandler())
                         val messageToSend = ChatUtils.getParsedMessageForSending(chatMessage.message, chatMessage.messageParameters)