diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
index fe912684e..b3c428611 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
@@ -28,8 +28,10 @@ import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.databinding.ItemCustomIncomingTextMessageBinding
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.nextcloud.talk.utils.ApiUtils
+import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability
 import com.nextcloud.talk.utils.ChatMessageUtils
 import com.nextcloud.talk.utils.DateUtils
+import com.nextcloud.talk.utils.SpreedFeatures
 import com.nextcloud.talk.utils.TextMatchers
 import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
 import com.nextcloud.talk.utils.message.MessageUtils
@@ -121,8 +123,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
 
             binding.messageText.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
             binding.messageText.text = processedMessageText
-
-        }else{
+        } else {
             binding.messageText.visibility = View.GONE
             binding.checkboxContainer.visibility = View.VISIBLE
         }
@@ -164,6 +165,12 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
             .createdAt
             .before(Date(System.currentTimeMillis() - AGE_THRESHOLD_FOR_EDIT_MESSAGE))
 
+        val messageIsEditable = hasSpreedFeatureCapability(
+            user.capabilities?.spreedCapability!!,
+            SpreedFeatures.EDIT_MESSAGES
+        ) &&
+            !isOlderThanTwentyFourHours
+
         checkBoxContainer.removeAllViews()
         val regex = """(- \[(X|x| )])\s*(.+)""".toRegex(RegexOption.MULTILINE)
         val matches = regex.findAll(message)
@@ -185,8 +192,8 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
             val checkBox = CheckBox(checkBoxContainer.context).apply {
                 text = taskText
                 this.isChecked = isChecked
-                this.isEnabled = !isOlderThanTwentyFourHours &&  chatMessage.actorType == "bots" || chatActivity
-                    .userAllowedByPrivilages(chatMessage)
+                this.isEnabled = (chatMessage.actorType == "bots" ||
+                    chatActivity.userAllowedByPrivilages(chatMessage))  && messageIsEditable
                 setOnCheckedChangeListener { _, _ ->
                     updateCheckboxStates(chatMessage, user, checkboxList)
                 }
@@ -195,7 +202,6 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
             checkboxList.add(checkBox)
             viewThemeUtils.platform.themeCheckbox(checkBox)
         }
-        checkBoxContainer.visibility = View.VISIBLE
         return true
     }
 
@@ -206,9 +212,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
                     user.capabilities?.spreedCapability!!,
                     intArrayOf(1)
                 )
-
                 val updatedMessage = updateMessageWithCheckboxStates(chatMessage.message!!, checkboxes)
-
                 chatRepository.editChatMessage(
                     user.getCredentials(),
                     ApiUtils.getUrlForChatMessage(apiVersion, user.baseUrl!!, chatMessage.token!!, chatMessage.id),
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
index 98f51f880..441c70917 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
@@ -32,9 +32,12 @@ import com.nextcloud.talk.data.network.NetworkMonitor
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.databinding.ItemCustomOutcomingTextMessageBinding
 import com.nextcloud.talk.models.json.chat.ReadStatus
+import com.nextcloud.talk.models.json.conversations.ConversationEnums
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.nextcloud.talk.utils.ApiUtils
+import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability
 import com.nextcloud.talk.utils.DateUtils
+import com.nextcloud.talk.utils.SpreedFeatures
 import com.nextcloud.talk.utils.TextMatchers
 import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
 import com.nextcloud.talk.utils.message.MessageUtils
@@ -132,8 +135,7 @@ class OutcomingTextMessageViewHolder(itemView: View) :
             binding.messageTime.layoutParams = layoutParams
             viewThemeUtils.platform.colorTextView(binding.messageText, ColorRole.ON_SURFACE_VARIANT)
             binding.messageText.text = processedMessageText
-
-        }else{
+        } else {
             binding.messageText.visibility = View.GONE
             binding.checkboxContainer.visibility = View.VISIBLE
         }
@@ -193,12 +195,23 @@ class OutcomingTextMessageViewHolder(itemView: View) :
     }
 
     private fun processCheckboxes(chatMessage: ChatMessage, user: User): Boolean {
+        val chatActivity = commonMessageInterface as ChatActivity
         val message = chatMessage.message!!.toSpanned()
         val messageTextView = binding.messageText
         val checkBoxContainer = binding.checkboxContainer
         val isOlderThanTwentyFourHours = chatMessage
             .createdAt
             .before(Date(System.currentTimeMillis() - AGE_THRESHOLD_FOR_EDIT_MESSAGE))
+        val messageIsEditable = hasSpreedFeatureCapability(
+            user.capabilities?.spreedCapability!!,
+            SpreedFeatures.EDIT_MESSAGES
+        ) && !isOlderThanTwentyFourHours
+
+        val isNoTimeLimitOnNoteToSelf = hasSpreedFeatureCapability(
+            user.capabilities?.spreedCapability!!,
+            SpreedFeatures
+                .EDIT_MESSAGES_NOTE_TO_SELF
+        ) && chatActivity.currentConversation?.type == ConversationEnums.ConversationType.NOTE_TO_SELF
 
         checkBoxContainer.removeAllViews()
         val regex = """(- \[(X|x| )])\s*(.+)""".toRegex(RegexOption.MULTILINE)
@@ -221,7 +234,7 @@ class OutcomingTextMessageViewHolder(itemView: View) :
             val checkBox = CheckBox(checkBoxContainer.context).apply {
                 text = taskText
                 this.isChecked = isChecked
-                this.isEnabled = !isOlderThanTwentyFourHours
+                this.isEnabled = messageIsEditable || isNoTimeLimitOnNoteToSelf
                 setOnCheckedChangeListener { _, _ ->
                     updateCheckboxStates(chatMessage, user, checkboxList)
                 }
@@ -230,8 +243,6 @@ class OutcomingTextMessageViewHolder(itemView: View) :
             checkboxList.add(checkBox)
             viewThemeUtils.platform.themeCheckbox(checkBox)
         }
-
-        checkBoxContainer.visibility = View.VISIBLE
         return true
     }