diff --git a/Core/source/lib/emailjs/emailjs-mime-codec.js b/Core/source/lib/emailjs/emailjs-mime-codec.js
index f2665daf6..b17f8c6e0 100644
--- a/Core/source/lib/emailjs/emailjs-mime-codec.js
+++ b/Core/source/lib/emailjs/emailjs-mime-codec.js
@@ -30,7 +30,7 @@
     });
   } else if (typeof exports === 'object' && typeof navigator !== 'undefined') {
     // common.js for browser
-    encoding = require('emailjs-stringencoding');
+    encoding = require('./emailjs-stringencoding');
     module.exports = factory(encoding.TextEncoder, encoding.TextDecoder, root.btoa);
   } else if (typeof exports === 'object') {
     // common.js for node.js
diff --git a/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift b/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
index dd18f2bc2..920098eb7 100644
--- a/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
+++ b/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
@@ -296,9 +296,6 @@ extension ComposeViewController {
             }
             return isValid
         }
-        .onShouldEndEditing { [weak self] textField in
-            return self?.showAlertIfTextFieldNotValidEmail(textField: textField) ?? true
-        }
         .onShouldChangeCharacters { [weak self] textField, character in
             self?.shouldChange(with: textField, and: character, for: type) ?? true
         }
diff --git a/appium/tests/data/index.ts b/appium/tests/data/index.ts
index c68c4b57c..b8a1a3a87 100644
--- a/appium/tests/data/index.ts
+++ b/appium/tests/data/index.ts
@@ -238,6 +238,7 @@ export const CommonData = {
       '\n' +
       'This will likely download a corrupted file. Download anyway?',
     invalidRecipient: 'Invalid recipient\nPlease enter a valid email address.',
+    oneOrMoreInvalidRecipient: 'One or more of your recipients have invalid email address (marked in red)',
     decryptMessageWithNoKeys:
       'Error\n' +
       'Could not open message\n\n' +
diff --git a/appium/tests/helpers/TouchHelper.ts b/appium/tests/helpers/TouchHelper.ts
index 68935c0c1..1db40768d 100644
--- a/appium/tests/helpers/TouchHelper.ts
+++ b/appium/tests/helpers/TouchHelper.ts
@@ -63,19 +63,7 @@ class TouchHelper {
   };
 
   static tapScreenAt = async ({ x, y }: { x: number; y: number }) => {
-    await driver.performActions([
-      {
-        id: 'tapScreenAt',
-        type: 'pointer',
-        parameters: { pointerType: 'touch' },
-        actions: [
-          { duration: 0, x, y, type: 'pointerMove', origin: 'viewport' },
-          { button: 0, type: 'pointerDown' },
-          { type: 'pause', duration: 100 },
-          { button: 0, type: 'pointerUp' },
-        ],
-      },
-    ]);
+    await driver.execute('mobile: tap', { x, y });
     await browser.pause(100);
   };
 
diff --git a/appium/tests/specs/mock/composeEmail/CheckInvalidEmailRecipient.spec.ts b/appium/tests/specs/mock/composeEmail/CheckInvalidEmailRecipient.spec.ts
index 7872841db..d9c05cb7f 100644
--- a/appium/tests/specs/mock/composeEmail/CheckInvalidEmailRecipient.spec.ts
+++ b/appium/tests/specs/mock/composeEmail/CheckInvalidEmailRecipient.spec.ts
@@ -24,6 +24,7 @@ describe('COMPOSE EMAIL: ', () => {
     };
 
     const invalidRecipientError = CommonData.errors.invalidRecipient;
+    const oneOrMoreInvalidRecipientError = CommonData.errors.oneOrMoreInvalidRecipient;
 
     await mockApi.withMockedApis(async () => {
       await SplashScreen.mockLogin();
@@ -42,7 +43,7 @@ describe('COMPOSE EMAIL: ', () => {
       await BaseScreen.clickOkButtonOnError();
 
       await NewMessageScreen.clickSendButton();
-      await BaseScreen.checkModalMessage(invalidRecipientError);
+      await BaseScreen.checkModalMessage(oneOrMoreInvalidRecipientError);
       await BaseScreen.clickOkButtonOnError();
     });
   });