diff --git a/tests/screenobjects/chats/ComposeAttachment.ts b/tests/screenobjects/chats/ComposeAttachment.ts
index 7063831a9df..c671bae4c29 100644
--- a/tests/screenobjects/chats/ComposeAttachment.ts
+++ b/tests/screenobjects/chats/ComposeAttachment.ts
@@ -16,6 +16,8 @@ const SELECTORS_WINDOWS = {
   COMPOSE_ATTACHMENTS_FILE_META: '[name="file-meta"]',
   COMPOSE_ATTACHMENTS_FILE_NAME: '[name="file-name"]',
   COMPOSE_ATTACHMENTS_FILE_NAME_TEXT: "<Text>",
+  COMPOSE_ATTACHMENTS_INPUT_ERROR: '[name="input-error"]',
+  COMPOSE_ATTACHMENTS_INPUT_ERROR_TEXT: "<Text>",
 };
 
 const SELECTORS_MACOS = {
@@ -28,6 +30,9 @@ const SELECTORS_MACOS = {
   COMPOSE_ATTACHMENTS_FILE_NAME: "~file-name",
   COMPOSE_ATTACHMENTS_FILE_NAME_TEXT:
     "-ios class chain:**/XCUIElementTypeStaticText",
+  COMPOSE_ATTACHMENTS_INPUT_ERROR: "~input-error",
+  COMPOSE_ATTACHMENTS_INPUT_ERROR_TEXT:
+    "-ios class chain:**/XCUIElementTypeStaticText",
 };
 
 currentOS === WINDOWS_DRIVER
@@ -44,58 +49,76 @@ export default class ComposeAttachments extends UplinkMainScreen {
   }
 
   get composeAttachmentsButton() {
-    return this.instance
-      .$(SELECTORS.COMPOSE_ATTACHMENTS)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_BUTTON);
+    return this.composeAttachments.$(SELECTORS.COMPOSE_ATTACHMENTS_BUTTON);
   }
 
   get composeAttachmentsFileEmbed() {
-    return this.instance
-      .$(SELECTORS.COMPOSE_ATTACHMENTS)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_EMBED);
+    return this.composeAttachments.$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_EMBED);
   }
 
   get composeAttachmentsFileIcon() {
-    return this.instance
-      .$(SELECTORS.COMPOSE_ATTACHMENTS)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_EMBED)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_ICON);
+    return this.composeAttachmentsFileEmbed.$(
+      SELECTORS.COMPOSE_ATTACHMENTS_FILE_ICON
+    );
   }
 
   get composeAttachmentsFileInfo() {
-    return this.instance
-      .$(SELECTORS.COMPOSE_ATTACHMENTS)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_EMBED)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_INFO);
+    return this.composeAttachmentsFileEmbed.$(
+      SELECTORS.COMPOSE_ATTACHMENTS_FILE_INFO
+    );
   }
 
   get composeAttachmentsFileMeta() {
-    return this.instance
-      .$(SELECTORS.COMPOSE_ATTACHMENTS)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_EMBED)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_META);
+    return this.composeAttachmentsFileEmbed.$(
+      SELECTORS.COMPOSE_ATTACHMENTS_FILE_META
+    );
   }
 
   get composeAttachmentsFileName() {
-    return this.instance
-      .$(SELECTORS.COMPOSE_ATTACHMENTS)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_EMBED)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_NAME);
+    return this.composeAttachmentsFileEmbed.$(
+      SELECTORS.COMPOSE_ATTACHMENTS_FILE_NAME
+    );
   }
 
   get composeAttachmentsFileNameText() {
-    return this.instance
-      .$(SELECTORS.COMPOSE_ATTACHMENTS)
-      .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_EMBED)
+    return this.composeAttachmentsFileEmbed
       .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_NAME)
       .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_NAME_TEXT);
   }
 
+  get composeAttachmentsInputError() {
+    return this.composeAttachments.$(SELECTORS.COMPOSE_ATTACHMENTS_INPUT_ERROR);
+  }
+
+  get composeAttachmentsInputErrorText() {
+    return this.composeAttachmentsInputError.$(
+      SELECTORS.COMPOSE_ATTACHMENTS_INPUT_ERROR_TEXT
+    );
+  }
+
   async deleteFileOnComposeAttachment() {
     const composeAttachmentsButton = await this.composeAttachmentsButton;
     await composeAttachmentsButton.click();
   }
 
+  async getListOfAttachmentsEmbed() {
+    const composeAttachments = await this.composeAttachments;
+    await composeAttachments.waitForExist();
+    const filesAttached = await this.instance.$$(
+      SELECTORS.COMPOSE_ATTACHMENTS_FILE_EMBED
+    );
+    let results = [];
+    for (let fileAttached of filesAttached) {
+      const fileName = await fileAttached
+        .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_INFO)
+        .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_NAME)
+        .$(SELECTORS.COMPOSE_ATTACHMENTS_FILE_NAME_TEXT);
+      const fileNameText = await fileName.getText();
+      results.push(fileNameText);
+    }
+    return results;
+  }
+
   async validateAttachmentIsAdded() {
     const composeAttachmentsFileEmbed = await this.composeAttachmentsFileEmbed;
     await driver[this.executor].waitUntil(
@@ -108,4 +131,18 @@ export default class ComposeAttachments extends UplinkMainScreen {
       }
     );
   }
+
+  async validateAttachmentWithFileNameIsAdded(
+    fileName: string,
+    expectedAssertion: boolean
+  ) {
+    const attachmentsList = await this.getListOfAttachmentsEmbed();
+    const includesAttachment = await attachmentsList.includes(fileName);
+    await expect(includesAttachment).toEqual(expectedAssertion);
+  }
+
+  async validateComposeAttachmentsIsShown() {
+    const composeAttachments = await this.composeAttachments;
+    await composeAttachments.waitForExist();
+  }
 }
diff --git a/tests/screenobjects/chats/InputBar.ts b/tests/screenobjects/chats/InputBar.ts
index e4294fe66ec..e164aca4c0b 100644
--- a/tests/screenobjects/chats/InputBar.ts
+++ b/tests/screenobjects/chats/InputBar.ts
@@ -205,6 +205,11 @@ export default class InputBar extends UplinkMainScreen {
     await uploadButtonLocalDisk.click();
   }
 
+  async selectUploadFromStorage() {
+    const uploadButtonStorage = await this.uploadButtonStorage;
+    await uploadButtonStorage.click();
+  }
+
   async typeCodeOnInputBar(language: string, codeToType: string) {
     const inputText = await this.inputText;
     await inputText.clearValue();
@@ -246,4 +251,9 @@ export default class InputBar extends UplinkMainScreen {
       await selectFileOnWindows(relativePath, uplinkContext, executor);
     }
   }
+
+  async openUploadFilesFromStorage() {
+    await this.clickOnUploadFile();
+    await this.selectUploadFromStorage();
+  }
 }
diff --git a/tests/screenobjects/chats/Messages.ts b/tests/screenobjects/chats/Messages.ts
index cfd28c58081..991a0ca1a51 100644
--- a/tests/screenobjects/chats/Messages.ts
+++ b/tests/screenobjects/chats/Messages.ts
@@ -300,10 +300,10 @@ export default class Messages extends UplinkMainScreen {
 
   async getLastMessageReceivedCodeLanguage() {
     const message = await this.getLastMessageReceivedLocator();
-    const messageCodeLanguage = await message
-      .$(SELECTORS.CHAT_MESSAGE_TEXT_GROUP)
-      .$(SELECTORS.CHAT_MESSAGE_CODE_LANGUAGE);
-    await messageCodeLanguage.waitForExist();
+    const messageText = await message.$(SELECTORS.CHAT_MESSAGE_TEXT_GROUP);
+    const messageCodeLanguage = await messageText.$(
+      SELECTORS.CHAT_MESSAGE_CODE_LANGUAGE
+    );
     return messageCodeLanguage;
   }
 
@@ -592,9 +592,10 @@ export default class Messages extends UplinkMainScreen {
 
   async getLastMessageSentCodeLanguage() {
     const message = await this.getLastMessageSentLocator();
-    const messageCodeLanguage = await message
-      .$(SELECTORS.CHAT_MESSAGE_TEXT_GROUP)
-      .$(SELECTORS.CHAT_MESSAGE_CODE_LANGUAGE);
+    const messageText = await message.$(SELECTORS.CHAT_MESSAGE_TEXT_GROUP);
+    const messageCodeLanguage = await messageText.$(
+      SELECTORS.CHAT_MESSAGE_CODE_LANGUAGE
+    );
     await messageCodeLanguage.waitForExist();
     return messageCodeLanguage;
   }
@@ -799,7 +800,7 @@ export default class Messages extends UplinkMainScreen {
     const lastMessageLinkEmbed = await lastMessage.$(
       SELECTORS.CHAT_MESSAGE_LINK_EMBED
     );
-    await lastMessageLinkEmbed.waitForExist();
+    await lastMessageLinkEmbed.waitForExist({ timeout: 30000 });
     return lastMessageLinkEmbed;
   }
 
@@ -836,7 +837,7 @@ export default class Messages extends UplinkMainScreen {
     const lastMessageLinkEmbed = await lastMessage.$(
       SELECTORS.CHAT_MESSAGE_LINK_EMBED
     );
-    await lastMessageLinkEmbed.waitForExist();
+    await lastMessageLinkEmbed.waitForExist({ timeout: 30000 });
     return lastMessageLinkEmbed;
   }
 
diff --git a/tests/screenobjects/chats/SendFiles.ts b/tests/screenobjects/chats/SendFiles.ts
index 74b5da6feb8..68ffe706a83 100644
--- a/tests/screenobjects/chats/SendFiles.ts
+++ b/tests/screenobjects/chats/SendFiles.ts
@@ -13,11 +13,14 @@ let SELECTORS = {};
 const SELECTORS_COMMON = {};
 
 const SELECTORS_WINDOWS = {
+  CLOSE_BUTTON: "<Button>",
+  CLOSE_BUTTON_MODAL: '[name="modal"]',
   CONTEXT_MENU: '[name="Context Menu"]',
   CONTEXT_MENU_FILES_RENAME: '[name="files-rename"]',
   CONTEXT_MENU_FOLDER_DELETE: '[name="folder-delete"]',
   CONTEXT_MENU_FOLDER_RENAME: '[name="folder-rename"]',
   FILE_FOLDER_NAME_TEXT: "//Text/Text",
+  FILE_THUMBNAIL: "<Image>",
   FILES_BREADCRUMBS: '[name="files-breadcrumbs"]',
   FILES_CRUMB: '[name="crumb"]',
   FILES_CRUMB_TEXT: "<Text>",
@@ -28,18 +31,22 @@ const SELECTORS_WINDOWS = {
   GO_TO_FILES_BUTTON: '[name="go_to_files_btn"]',
   HOME_DIR: '[name="home-dir"]',
   HOME_DIR_TEXT: '[name="Home"]',
+  NO_FILES_AVAILABLE: "//Text/Text",
   SEND_FILES_BODY: '[name="send-files-body"]',
   SEND_FILES_LAYOUT: '[name="send-files-layout"]',
   SEND_FILES_MODAL_SEND_BUTTON: '[name="send_files_modal_send_button"]',
 };
 
 const SELECTORS_MACOS = {
+  CLOSE_BUTTON: "-ios class chain:**/XCUIElementTypeButton",
+  CLOSE_BUTTON_MODAL: "~modal",
   CONTEXT_MENU: "~Context Menu",
   CONTEXT_MENU_FILES_RENAME: "~files-rename",
   CONTEXT_MENU_FOLDER_DELETE: "~folder-delete",
   CONTEXT_MENU_FOLDER_RENAME: "~folder-rename",
   FILE_FOLDER_NAME_TEXT:
     "-ios class chain:**/XCUIElementTypeStaticText/XCUIElementTypeStaticText",
+  FILE_THUMBNAIL: "-ios class chain:**/XCUIElementTypeImage",
   FILES_BREADCRUMBS: "~files-breadcrumbs",
   FILES_CRUMB: "~crumb",
   FILES_CRUMB_TEXT: "-ios class chain:**/XCUIElementTypeStaticText",
@@ -50,6 +57,8 @@ const SELECTORS_MACOS = {
   INPUT_ERROR: "~input-error",
   INPUT_ERROR_TEXT: "-ios class chain:**/XCUIElementTypeStaticText",
   INPUT_FOLDER_FILE_NAME: "-ios class chain:**/XCUIElementTypeTextField",
+  NO_FILES_AVAILABLE:
+    "-ios class chain:**/XCUIElementTypeStaticText/XCUIElementTypeStaticText",
   SEND_FILES_BODY: "~send-files-body",
   SEND_FILES_LAYOUT: "~send-files-layout",
   SEND_FILES_MODAL_SEND_BUTTON: "~send_files_modal_send_button",
@@ -64,6 +73,14 @@ export default class SendFiles extends UplinkMainScreen {
     super(executor, SELECTORS.SEND_FILES_LAYOUT);
   }
 
+  get closeButton() {
+    return this.closeButtonModal.$(SELECTORS.CLOSE_BUTTON);
+  }
+
+  get closeButtonModal() {
+    return this.instance.$(SELECTORS.CLOSE_BUTTON_MODAL);
+  }
+
   get contextMenu() {
     return this.instance.$(SELECTORS.CONTEXT_MENU);
   }
@@ -84,6 +101,10 @@ export default class SendFiles extends UplinkMainScreen {
     return this.sendFilesBody.$(SELECTORS.FILE_FOLDER_NAME_TEXT);
   }
 
+  get fileThumbnail() {
+    return this.sendFilesBody.$(SELECTORS.FILE_THUMBNAIL);
+  }
+
   get filesBreadcrumbs() {
     return this.sendFilesBody.$(SELECTORS.FILES_BREADCRUMBS);
   }
@@ -124,6 +145,10 @@ export default class SendFiles extends UplinkMainScreen {
     return this.sendFilesBody.$(SELECTORS.INPUT_FOLDER_FILE_NAME);
   }
 
+  get noFilesAvailable() {
+    return this.sendFilesBody.$(SELECTORS.NO_FILES_AVAILABLE);
+  }
+
   get sendFilesBody() {
     return this.sendFilesLayout.$(SELECTORS.SEND_FILES_BODY);
   }
@@ -136,9 +161,16 @@ export default class SendFiles extends UplinkMainScreen {
     return this.sendFilesBody.$(SELECTORS.SEND_FILES_MODAL_SEND_BUTTON);
   }
 
+  async clickOnCloseModal() {
+    const closeButton = await this.closeButton;
+    await closeButton.click();
+  }
+
   async clickOnFileOrFolder(locator: string) {
     const fileOrFolderLocator = await this.getLocatorOfFolderFile(locator);
-    const fileOrFolderElement = await this.instance.$(fileOrFolderLocator);
+    const fileOrFolderElement = await this.instance
+      .$(fileOrFolderLocator)
+      .$(SELECTORS.FILE_THUMBNAIL);
     await fileOrFolderElement.click();
   }
 
@@ -168,6 +200,18 @@ export default class SendFiles extends UplinkMainScreen {
     await sendFilesButton.click();
   }
 
+  async getValueFromSendFilesButton() {
+    const currentDriver = await this.getCurrentDriver();
+    const sendFilesModalSendButton = await this.sendFilesModalSendButton;
+    let result;
+    if (currentDriver === WINDOWS_DRIVER) {
+      result = await sendFilesModalSendButton.getAttribute("HelpText");
+    } else {
+      result = await sendFilesModalSendButton.getAttribute("placeholderValue");
+    }
+    return result.toString();
+  }
+
   async typeOnFileFolderNameInput(name: string) {
     const inputFolderFileName = await this.inputFolderFileName;
     await inputFolderFileName.waitForExist();
@@ -236,11 +280,30 @@ export default class SendFiles extends UplinkMainScreen {
     await this.instance.$(fileFolderLocator).waitForExist({ reverse: true });
   }
 
+  async validateNoFilesAvailableIsShown() {
+    const noFilesAvailable = await this.noFilesAvailable;
+    await noFilesAvailable.waitForExist();
+    await expect(noFilesAvailable).toHaveTextContaining("NO FILES AVAILABLE.");
+  }
+
+  async validateSendFilesButtonText(expectedText: string) {
+    await this.getValueFromSendFilesButton().then((value) => {
+      expect(value).toEqual(expectedText);
+    });
+  }
+
   async validateSendFilesModalIsShown() {
     const filesBody = await this.sendFilesLayout;
     await filesBody.waitForExist();
   }
 
+  async validateThumbnailIsShown(name: string) {
+    const fileElementLocator = await this.getLocatorOfFolderFile(name);
+    const fileElement = await this.instance.$(fileElementLocator);
+    const fileThumbnail = await fileElement.$(SELECTORS.FILE_THUMBNAIL);
+    await fileThumbnail.waitForExist();
+  }
+
   // Context Menu methods
 
   async openFilesContextMenu(name: string) {
diff --git a/tests/screenobjects/files/FilesScreen.ts b/tests/screenobjects/files/FilesScreen.ts
index 9cd2b54d78b..3d732fe6ee9 100644
--- a/tests/screenobjects/files/FilesScreen.ts
+++ b/tests/screenobjects/files/FilesScreen.ts
@@ -363,6 +363,12 @@ export default class FilesScreen extends UplinkMainScreen {
     const filesInfoCurrentSizeLabel = await this.filesInfoCurrentSizeLabel;
     await inputFolderFileName.waitForExist();
     await inputFolderFileName.setValue(name);
+    // Retry typing if appium fails on type
+    const inputValue = await inputFolderFileName.getText();
+    if (inputValue !== name) {
+      await this.createFolder(name);
+    }
+    // If name was typed correctly, continue with method execution
     await filesInfoCurrentSizeLabel.click();
     const newFolder = await this.getLocatorOfFolderFile(name);
     const newFolderElement = await this.instance.$(newFolder);
diff --git a/tests/specs/reusable-accounts/05-message-attachments.spec.ts b/tests/specs/reusable-accounts/05-message-attachments.spec.ts
index 0556f11062e..1aacf95d9be 100644
--- a/tests/specs/reusable-accounts/05-message-attachments.spec.ts
+++ b/tests/specs/reusable-accounts/05-message-attachments.spec.ts
@@ -1,16 +1,160 @@
 import "module-alias/register";
 import { USER_A_INSTANCE, USER_B_INSTANCE } from "@helpers/constants";
 import ComposeAttachment from "@screenobjects/chats/ComposeAttachment";
+import FilesScreen from "@screenobjects/files/FilesScreen";
 import InputBar from "@screenobjects/chats/InputBar";
 import Messages from "@screenobjects/chats/Messages";
+import SendFiles from "@screenobjects/chats/SendFiles";
 let chatsAttachmentFirstUser = new ComposeAttachment(USER_A_INSTANCE);
 let chatsAttachmentSecondUser = new ComposeAttachment(USER_B_INSTANCE);
 let chatsInputFirstUser = new InputBar(USER_A_INSTANCE);
 let chatsInputSecondUser = new InputBar(USER_B_INSTANCE);
 let chatsMessagesFirstUser = new Messages(USER_A_INSTANCE);
 let chatsMessagesSecondUser = new Messages(USER_B_INSTANCE);
+let filesScreenSecondUser = new FilesScreen(USER_B_INSTANCE);
+let sendFilesSecondUser = new SendFiles(USER_B_INSTANCE);
 
 export default async function messageAttachmentsTests() {
+  it("Send files from Browse Files - No files are displayed on modal and user can close modal", async () => {
+    // Go to upload button and then select Browser Files (from Uplink storage)
+    await chatsInputSecondUser.openUploadFilesFromStorage();
+    await sendFilesSecondUser.validateSendFilesModalIsShown();
+    await sendFilesSecondUser.validateNoFilesAvailableIsShown();
+
+    // Click outside of the modal to close it, in this case on the send message button
+    await sendFilesSecondUser.clickOnCloseModal();
+  });
+
+  it("Send files from Browse Files - Upload an image on Files to run tests", async () => {
+    // Go to Files Screen andand upload an image file before starting
+    await chatsInputSecondUser.goToFiles();
+    await filesScreenSecondUser.validateFilesScreenIsShown();
+    await filesScreenSecondUser.uploadFile("./tests/fixtures/logo.jpg");
+    await filesScreenSecondUser.validateFileOrFolderExist("logo.jpg");
+  });
+
+  it("Send files from Browse Files - Upload a txt file in a different folder", async () => {
+    // Create a new folder and enter on it
+    await filesScreenSecondUser.createFolder("testfolder01");
+    await filesScreenSecondUser.validateFileOrFolderExist("testfolder01");
+    await filesScreenSecondUser.clickOnFileOrFolder("testfolder01");
+
+    // Upload one time the testfile.txt file
+    await filesScreenSecondUser.uploadFile("./tests/fixtures/testfile.txt");
+    await filesScreenSecondUser.validateFileOrFolderExist("testfile.txt");
+
+    // Return to chat screen
+    await filesScreenSecondUser.goToMainScreen();
+  });
+
+  it("Send files from Browse Files - Thumbnails are displayed on modal", async () => {
+    // Open modal to send files from storage
+    await chatsInputSecondUser.openUploadFilesFromStorage();
+    await sendFilesSecondUser.validateSendFilesModalIsShown();
+
+    // Go to Home Folder and validate thumbnail for file is shown
+    await sendFilesSecondUser.clickOnHomeFolderCrumb();
+    await filesScreenSecondUser.validateFileOrFolderExist("logo.jpg");
+    await sendFilesSecondUser.validateThumbnailIsShown("logo.jpg");
+  });
+
+  it("Send files from Browse Files - User can navigate through folders and to home", async () => {
+    // Navigate to testfolder01 and ensure thumbnail from testfile.txt is shown
+    await sendFilesSecondUser.clickOnFileOrFolder("testfolder01");
+    await filesScreenSecondUser.validateFileOrFolderExist("testfile.txt");
+    await sendFilesSecondUser.validateThumbnailIsShown("testfile.txt");
+
+    // Navigate to home folder and ensure thumbnail from logo.jpg is shown
+    await sendFilesSecondUser.clickOnHomeFolderCrumb();
+    await filesScreenSecondUser.validateFileOrFolderExist("logo.jpg");
+    await sendFilesSecondUser.validateThumbnailIsShown("logo.jpg");
+  });
+
+  it("Send files from Browse Files - Go to files button redirects to Files", async () => {
+    // Click on Go To Files button and validate User is redirected to Files Screen
+    await sendFilesSecondUser.clickOnGoToFiles();
+    await filesScreenSecondUser.validateFilesScreenIsShown();
+
+    // Return to Chat Screen and open again the Send Files from Storage modal
+    await filesScreenSecondUser.goToMainScreen();
+    await chatsInputSecondUser.openUploadFilesFromStorage();
+    await sendFilesSecondUser.validateSendFilesModalIsShown();
+  });
+
+  it("Send files from Browse Files - Send files button shows 0/8 files if no files are selected", async () => {
+    // When no files are selected, Send Files button should display 0/8 File(s)
+    await sendFilesSecondUser.validateSendFilesButtonText("Send 0/8 File(s)");
+  });
+
+  // Skipped since there is a bug reported for this button
+  xit("Send files from Browse Files - User cannot click on send files if no files are selected", async () => {
+    // Click on Send files button without any files selected
+    await sendFilesSecondUser.clickOnSendFilesButton();
+
+    // Ensure that Send Files Modal is still displayed
+    await sendFilesSecondUser.validateSendFilesModalIsShown();
+  });
+
+  it("Send files from Browse Files - Can select files from different folders and send files counter is updated", async () => {
+    // Select one file from root folder and ensure Send Files button displays 1/8 File(s)
+    await sendFilesSecondUser.clickOnFileOrFolder("logo.jpg");
+    await sendFilesSecondUser.validateSendFilesButtonText("Send 1/8 File(s)");
+
+    // Go to testfolder01 and select one file from this folder
+    await sendFilesSecondUser.clickOnFileOrFolder("testfolder01");
+    await filesScreenSecondUser.validateFileOrFolderExist("testfile.txt");
+    await sendFilesSecondUser.clickOnFileOrFolder("testfile.txt");
+
+    // Ensure Send Files button displays 2/8 File(s)
+    await sendFilesSecondUser.validateSendFilesButtonText("Send 2/8 File(s)");
+
+    // Remove selection from file and valiate Send Files button displays 1/8 File(s)
+    await sendFilesSecondUser.clickOnFileOrFolder("testfile.txt");
+    await sendFilesSecondUser.validateSendFilesButtonText("Send 1/8 File(s)");
+  });
+
+  it("Send files from Browse Files - Files selected will be displayed on Compose Attachment", async () => {
+    // Send the only image file previously selected
+    await sendFilesSecondUser.clickOnSendFilesButton();
+
+    // Validate file is displayed on Compose Attachment
+    // Validate compose attachments displays the files to be uploaded before sending the message
+    await chatsAttachmentSecondUser.validateComposeAttachmentsIsShown();
+
+    // Obtain the list of attachments added to Compose Attachment
+    await chatsAttachmentSecondUser.validateAttachmentWithFileNameIsAdded(
+      "logo.jpg",
+      true
+    );
+  });
+
+  it("Send files from Browse Files - Message sent with attachments is shown on local side", async () => {
+    // Type a text message and send it
+    await chatsInputSecondUser.typeMessageOnInput("Attached");
+    await chatsInputSecondUser.clickOnSendMessage();
+
+    // Ensure that message sent with attached file is displayed on local side
+    await chatsMessagesSecondUser.waitForMessageSentToExist("Attached");
+
+    await chatsMessagesSecondUser.chatMessageFileEmbedLocal.waitForExist();
+
+    // Validate text from message containing attachment
+    const textMessage = await chatsMessagesSecondUser.getLastMessageSentText();
+    await expect(textMessage).toHaveTextContaining("Attached");
+  });
+
+  it("Send files from Browse Files - Message sent with attachments is shown on remote side", async () => {
+    // Ensure that message sent with attached file is displayed on remote side
+    // With User A- Validate that message with attachment was received
+    await chatsMessagesFirstUser.switchToOtherUserWindow();
+    await chatsInputFirstUser.clickOnInputBar();
+    await chatsMessagesFirstUser.chatMessageFileEmbedRemote.waitForExist();
+
+    // Validate text from message containing attachment
+    const message = await chatsMessagesFirstUser.getLastMessageReceivedText();
+    await expect(message).toHaveTextContaining("Attached");
+  });
+
   it("Chat User B - Validate compose attachments contents", async () => {
     // Switch to User B window
     await chatsInputSecondUser.switchToOtherUserWindow();
@@ -45,9 +189,9 @@ export default async function messageAttachmentsTests() {
     await chatsAttachmentFirstUser.composeAttachmentsFileEmbed.waitForExist();
 
     // Type a text message and send it
-    await chatsInputFirstUser.typeMessageOnInput("Attached");
+    await chatsInputFirstUser.typeMessageOnInput("Attached2");
     await chatsInputFirstUser.clickOnSendMessage();
-    await chatsMessagesFirstUser.waitForMessageSentToExist("Attached");
+    await chatsMessagesFirstUser.waitForMessageSentToExist("Attached2");
   });
 
   it("Chat User A - Message Sent With Attachment - Text contents", async () => {
@@ -55,7 +199,7 @@ export default async function messageAttachmentsTests() {
 
     // Validate text from message containing attachment
     const textMessage = await chatsMessagesFirstUser.getLastMessageSentText();
-    await expect(textMessage).toHaveTextContaining("Attached");
+    await expect(textMessage).toHaveTextContaining("Attached2");
   });
 
   it("Chat User A - Message Sent With Attachment - File Meta Data", async () => {
@@ -91,7 +235,7 @@ export default async function messageAttachmentsTests() {
 
     // Validate text from message containing attachment
     const message = await chatsMessagesSecondUser.getLastMessageReceivedText();
-    await expect(message).toHaveTextContaining("Attached");
+    await expect(message).toHaveTextContaining("Attached2");
   });
 
   it("Chat User B - Received Message with Attachment - File Metadata", async () => {
diff --git a/tests/specs/reusable-accounts/06-chat-topbar.spec.ts b/tests/specs/reusable-accounts/06-chat-topbar.spec.ts
index b36b73553af..1ab302f43fd 100644
--- a/tests/specs/reusable-accounts/06-chat-topbar.spec.ts
+++ b/tests/specs/reusable-accounts/06-chat-topbar.spec.ts
@@ -92,7 +92,7 @@ export default async function chatTopbarTests() {
     await pinnedMessagesFirstUser.validateFirstPinnedMessageImageProfileIsShown();
     await pinnedMessagesFirstUser.validateFirstPinnedMessageTimestampIsShown();
     await pinnedMessagesFirstUser.validateFirstPinnedMessageSender("ChatUserA");
-    await pinnedMessagesFirstUser.validateFirstPinnedMessageText("Attached");
+    await pinnedMessagesFirstUser.validateFirstPinnedMessageText("Attached2");
   });
 
   it("Pinned Messages - Pinned message with attachment shows icon, extension, filename and metadata", async () => {