diff --git a/test/ui-test/testSuites/suite_communities/shared/scripts/community_names.py b/test/ui-test/testSuites/suite_communities/shared/scripts/community_names.py
index 62a4759d29..ded7ed8d29 100644
--- a/test/ui-test/testSuites/suite_communities/shared/scripts/community_names.py
+++ b/test/ui-test/testSuites/suite_communities/shared/scripts/community_names.py
@@ -31,6 +31,8 @@ communitySettings_MembersTab_Member_Kick_Button = {"container": communitySetting
 communitySettings_KickModal_Kick_Button = {"container": statusDesktop_mainWindow_overlay, "objectName": "CommunityMembers_KickModal_KickButton", "type": "StatusButton", "visible": True}
 chatView_TogglePinMessageButton = {"container": chatView_log, "objectName": "MessageView_toggleMessagePin", "type": "StatusFlatRoundButton", "visible": True}
 chatView_ReplyToMessageButton = {"container": chatView_log, "objectName": "replyToMessageButton", "type": "StatusFlatRoundButton", "visible": True}
+chatView_editMessageInputComponent = {"container": statusDesktop_mainWindow, "objectName": "editMessageInput", "type": "StatusChatInput", "visible": True}
+chatView_editMessageInputTextArea = {"container": chatView_editMessageInputComponent, "objectName": "messageInputField", "type": "TextArea", "visible": True}
 
 # Community channel popup:
 createOrEditCommunityChannelNameInput_TextEdit = {"container": statusDesktop_mainWindow_overlay, "objectName": "createOrEditCommunityChannelNameInput", "type": "TextEdit", "visible": True}
diff --git a/test/ui-test/testSuites/suite_communities/tst_communityMessageFlows/test.feature b/test/ui-test/testSuites/suite_communities/tst_communityMessageFlows/test.feature
index 80a51329d2..8cd3e40ac1 100644
--- a/test/ui-test/testSuites/suite_communities/tst_communityMessageFlows/test.feature
+++ b/test/ui-test/testSuites/suite_communities/tst_communityMessageFlows/test.feature
@@ -67,3 +67,14 @@ Feature: Status Desktop community messages
         Examples:
         | message                | reply           |
         | Community chat message | This is a reply |
+
+    Scenario Outline: The user can edit a message
+        Given the user sends a chat message "Edit me"
+        # Checking that message can be edited several times
+        When the user edits the message at index 0 and changes it to "first edition"
+        Then the chat message "first edition" is displayed as an edited one
+        When the user edits the message at index 0 and changes it to "<edited>"
+        Then the chat message "<edited>" is displayed as an edited one
+        Examples:
+        | edited       |
+        | Edited by me |
diff --git a/test/ui-test/testSuites/suite_messaging/shared/scripts/chat_names.py b/test/ui-test/testSuites/suite_messaging/shared/scripts/chat_names.py
index 40e3bc8554..6023b4b8c3 100644
--- a/test/ui-test/testSuites/suite_messaging/shared/scripts/chat_names.py
+++ b/test/ui-test/testSuites/suite_messaging/shared/scripts/chat_names.py
@@ -5,7 +5,6 @@ mainWindow_scrollView_ScrollView = {"container": statusDesktop_mainWindow, "id":
 chatView_chatLogView_lastMsg_MessageView = {"container": chatView_log, "index": 0, "type": "MessageView"}
 chatView_lastChatText_Text = {"container": chatView_chatLogView_lastMsg_MessageView, "type": "TextEdit", "objectName": "StatusTextMessage_chatText", "visible": True}
 chatView_editMessageInputComponent = {"container": statusDesktop_mainWindow, "objectName": "editMessageInput", "type": "StatusChatInput", "visible": True}
-chatView_editMessageInputTextArea = {"container": chatView_editMessageInputComponent, "objectName": "messageInputField", "type": "TextArea", "visible": True}
 mark_as_Read_StatusMenuItem = {"container": statusDesktop_mainWindow_overlay, "objectName": "chatMarkAsReadMenuItem", "type": "StatusMenuItem", "visible": True}
 chat_Input_Stickers_Button = {"container": statusDesktop_mainWindow, "objectName": "statusChatInputStickersButton", "type": "StatusFlatRoundButton", "visible": True}
 chatView_SuggestionBoxPanel ={"container": statusDesktop_mainWindow, "objectName": "suggestionsBox", "type": "SuggestionBoxPanel"}