diff --git a/test/appium/tests/atomic/chats/test_one_to_one.py b/test/appium/tests/atomic/chats/test_one_to_one.py
index 1343c336a2..94ae6d1a63 100644
--- a/test/appium/tests/atomic/chats/test_one_to_one.py
+++ b/test/appium/tests/atomic/chats/test_one_to_one.py
@@ -630,29 +630,34 @@ class TestMessagesOneToOneChatSingle(SingleDeviceTestCase):
 
         home.join_public_chat(''.join(random.choice(string.ascii_lowercase) for _ in range(7)))
         chat = sign_in.get_chat_view()
-        message_text = 'mmmeowesage_text'
+        message_text = {'text_message': 'mmmeowesage_text'}
+        formatted_message = {'message_with_link':'https://status.im',
+                        'message_with_tag': '#successishere'}
         message_input = chat.chat_message_input
-        message_input.send_keys(message_text)
+        message_input.send_keys(message_text['text_message'])
         chat.send_message_button.click()
 
-        chat.element_by_text_part(message_text).long_press_element()
-        chat.element_by_text('Copy').click()
+        chat.copy_message_text(message_text['text_message'])
 
         message_input.paste_text_from_clipboard()
-        if message_input.text != message_text:
-            self.errors.append('Message text was not copied in a public chat')
+        if message_input.text != message_text['text_message']:
+            self.errors.append('Message %s text was not copied in a public chat' % message_text['text_message'])
+        message_input.clear()
 
-        chat.get_back_to_home_view()
-        home.add_contact(transaction_senders['M']['public_key'])
-        message_input.send_keys(message_text)
-        chat.send_message_button.click()
+        #TODO: uncomment after #11168 and 11161 is fixed
+        #for message in formatted_message:
+        #    message_input.send_keys(formatted_message[message])
+        #    chat.send_message_button.click()
 
-        chat.chat_element_by_text(message_text).long_press_element()
-        chat.element_by_text('Copy').click()
+        #    message_bubble = chat.chat_element_by_text(formatted_message[message])
+        #    message_bubble.timestamp_message.long_press_element()
+        #    chat.element_by_text('Copy').click()
+
+        #    message_input.paste_text_from_clipboard()
+        #    if message_input.text != formatted_message[message]:
+        #        self.errors.append('Message %s text was not copied in a public chat' % formatted_message[message])
+        #    message_input.clear()
 
-        message_input.paste_text_from_clipboard()
-        if message_input.text != message_text:
-            self.errors.append('Message text was not copied in 1-1 chat')
         self.errors.verify_no_errors()
 
     @marks.testrail_id(5322)
diff --git a/test/appium/views/chat_view.py b/test/appium/views/chat_view.py
index 06d993d121..529c5e578e 100644
--- a/test/appium/views/chat_view.py
+++ b/test/appium/views/chat_view.py
@@ -427,8 +427,8 @@ class ChatElementByText(BaseText):
         class TimeStampText(BaseText):
             def __init__(self, driver, parent_locator: str):
                 super(TimeStampText, self).__init__(driver)
-                text = "//*[1]/*[1]/*[6]"
-                self.locator = self.Locator.xpath_selector(parent_locator + text)
+                suffix = "//android.widget.TextView)[last()]"
+                self.locator = self.Locator.xpath_selector("(" + parent_locator + suffix)
 
         return TimeStampText(self.driver, self.locator.value)
 
@@ -898,6 +898,10 @@ class ChatView(BaseView):
         self.chat_message_input.send_keys(message)
         self.send_message_button.click()
 
+    def copy_message_text(self, message_text):
+        self.element_by_text_part(message_text).long_press_element()
+        self.element_by_text('Copy').click()
+
     def quote_message(self, message = str):
         self.element_by_text_part(message).long_press_element()
         self.reply_message_button.click()