diff --git a/test/appium/tests/atomic/account_management/test_profile.py b/test/appium/tests/atomic/account_management/test_profile.py
index b8c38fd20e..580cb8a189 100644
--- a/test/appium/tests/atomic/account_management/test_profile.py
+++ b/test/appium/tests/atomic/account_management/test_profile.py
@@ -367,6 +367,7 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
         profile_1.specify_name_input.set_value(server_name)
         profile_1.mail_server_address_input.set_value(mailserver_address)
         profile_1.save_button.click()
+        profile_1.mail_server_auto_selection_button.click()
         profile_1.mail_server_by_name(server_name).click()
         profile_1.mail_server_connect_button.click()
         profile_1.confirm_button.click()
diff --git a/test/appium/tests/atomic/account_management/test_wallet_modal.py b/test/appium/tests/atomic/account_management/test_wallet_modal.py
index f54a711fe7..ab15dfd23e 100644
--- a/test/appium/tests/atomic/account_management/test_wallet_modal.py
+++ b/test/appium/tests/atomic/account_management/test_wallet_modal.py
@@ -11,6 +11,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5398)
     @marks.high
+    @marks.skip
     def test_wallet_modal_public_chat(self):
         user = wallet_users['A']
         sign_in = SignInView(self.driver)
@@ -39,6 +40,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5399)
     @marks.high
+    @marks.skip
     def test_wallet_modal_dapp(self):
         user = wallet_users['B']
         sign_in = SignInView(self.driver)
@@ -70,6 +72,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5692)
     @marks.high
+    @marks.skip
     def test_wallet_modal_1_1_chat(self):
         user = wallet_users['C']
         recipient_address = basic_user['public_key']
@@ -99,6 +102,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5693)
     @marks.high
+    @marks.skip
     def test_wallet_modal_group_chat(self):
         user = wallet_users['D']
         recipient_address = basic_user['public_key']
@@ -131,6 +135,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5400)
     @marks.high
+    @marks.skip
     def test_wallet_modal_transaction_history(self):
         user = wallet_users['B']
         sign_in = SignInView(self.driver)
@@ -148,6 +153,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5480)
     @marks.low
+    @marks.skip
     def test_close_and_open_wallet_modal(self):
         user = wallet_users['B']
         sign_in = SignInView(self.driver)
@@ -175,6 +181,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5484)
     @marks.low
+    @marks.skip
     def test_close_wallet_modal_via_closs_icon(self):
         sign_in_view = SignInView(self.driver)
         home = sign_in_view.create_user()
@@ -190,6 +197,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5483)
     @marks.low
+    @marks.skip
     def test_close_wallet_modal_via_device_back_button(self):
         sign_in_view = SignInView(self.driver)
         home = sign_in_view.create_user()
@@ -212,6 +220,7 @@ class TestWalletModal(SingleDeviceTestCase):
 
     @marks.testrail_id(5482)
     @marks.low
+    @marks.skip
     def test_switch_between_main_and_history_in_wallet_modal(self):
         sign_in_view = SignInView(self.driver)
         home = sign_in_view.create_user()
diff --git a/test/appium/views/profile_view.py b/test/appium/views/profile_view.py
index 36149ec667..5e21584698 100644
--- a/test/appium/views/profile_view.py
+++ b/test/appium/views/profile_view.py
@@ -366,12 +366,23 @@ class MailServerAddressInput(BaseEditBox):
         self.locator = self.Locator.xpath_selector("//android.widget.EditText[@text='Specify a mailserver address']")
 
 
+class MailServerAutoSelectionButton(BaseButton):
+    def __init__(self, driver):
+        super(MailServerAutoSelectionButton, self).__init__(driver)
+        self.locator = self.Locator.xpath_selector("//*[contains(@text,'Automatic selection')]")
+
+
 class MailServerElement(BaseButton):
 
     def __init__(self, driver, server_name):
         super(MailServerElement, self).__init__(driver)
+        self.server_name = server_name
         self.locator = self.Locator.xpath_selector("//*[@content-desc='mailserver-item']//*[@text='%s']" % server_name)
 
+    def click(self):
+        self.scroll_to_element().click()
+        self.driver.info('Tap on "%s" mailserver value' % self.server_name)
+
 
 class MailServerConnectButton(BaseButton):
 
@@ -471,6 +482,7 @@ class ProfileView(BaseView):
         self.mail_server_button = MailServerButton(self.driver)
         self.mail_server_address_input = MailServerAddressInput(self.driver)
         self.mail_server_connect_button = MailServerConnectButton(self.driver)
+        self.mail_server_auto_selection_button = MailServerAutoSelectionButton(self.driver)
 
     def switch_network(self, network):
         self.advanced_button.click()