diff --git a/e2e/chatTest.spec.ts b/e2e/chatTest.spec.ts
index 098790af..8ec09f92 100644
--- a/e2e/chatTest.spec.ts
+++ b/e2e/chatTest.spec.ts
@@ -1,25 +1,27 @@
 import { by, element, device, expect } from 'detox';
-import { describe, it, beforeEach, beforeAll } from '@jest/globals';
+import { describe, it, beforeEach, expect as jestExpect } from '@jest/globals';
 import accountFixtures from './fixtures/accounts.json';
 
 import {
   APISignUpMentee,
   APISignUpMentor,
+  APIGetSendInfo,
   APIDeleteAccounts,
+  APISendMessage,
   waitAndTypeText,
   signIn,
   forceLogout,
+  detoxElementCount,
 } from './helpers';
 
 describe('Chat', () => {
-  beforeAll(async () => {
-    await device.launchApp();
-    jest.setTimeout(200000);
-  });
   beforeEach(async () => {
     await APIDeleteAccounts();
     await device.reloadReactNative();
   });
+  afterEach(async () => {
+    await forceLogout();
+  });
 
   it('with new mentor', async () => {
     const mentee = accountFixtures.mentees[0];
@@ -32,8 +34,8 @@ describe('Chat', () => {
 
     await signIn(mentee);
 
-    await element(by.text('Show mentor')).tap();
-    await element(by.text('Chat')).tap();
+    await element(by.id('components.mentorCard.readMore')).tap();
+    await element(by.id('main.mentorCardExpanded.button')).tap();
 
     await waitAndTypeText('main.chat.input.input', message_from_mentee, true);
     await element(by.id('main.chat.input.button')).tap();
@@ -59,4 +61,84 @@ describe('Chat', () => {
     await expect(element(by.text(message_from_mentee))).toBeVisible();
     await expect(element(by.text(message_from_mentor))).toBeVisible();
   });
+
+  const sendMultiple = async (
+    from: string,
+    to: string,
+    headers: { Authorization: string },
+    content: string,
+    amount: number,
+  ) => {
+    for (let i = 0; i < amount; i++) {
+      await APISendMessage({
+        sender_id: from,
+        recipient_id: to,
+        content: `${content} ${i}`,
+        headers,
+      });
+    }
+  };
+
+  it('marks message unseen', async () => {
+    const mentee = accountFixtures.mentees[0];
+    await APISignUpMentee(mentee);
+    const mentee2 = accountFixtures.mentees[1];
+    await APISignUpMentee(mentee2);
+    const mentor = accountFixtures.mentors[0];
+    await APISignUpMentor(mentor);
+
+    const {
+      sender_id: menteeId,
+      recipient_id: mentorId,
+      senderHeaders: menteeHeaders,
+    } = await APIGetSendInfo(mentee, mentor);
+    await sendMultiple(menteeId, mentorId, menteeHeaders, 'Hello', 5);
+
+    const { sender_id: mentee2Id, senderHeaders: mentee2Headers } =
+      await APIGetSendInfo(mentee2, mentor);
+    await sendMultiple(mentee2Id, mentorId, mentee2Headers, 'Hello', 10);
+
+    await signIn(mentor);
+    await element(by.id('tabs.chats')).tap();
+
+    const unseenDotsAmountBefore = await detoxElementCount(
+      by.id('main.buddyList.button.unseenDot'),
+    );
+    jestExpect(unseenDotsAmountBefore).toBe(2);
+
+    await element(by.text(mentee.displayName)).tap();
+    await expect(element(by.text('Hello 0'))).toBeVisible();
+    await expect(element(by.text('Hello 4'))).toBeVisible();
+
+    await element(by.id('chat.back.button')).tap();
+
+    const unseenDotsAmountAfter = await detoxElementCount(
+      by.id('main.buddyList.button.unseenDot'),
+    );
+    jestExpect(unseenDotsAmountAfter).toBe(1);
+  });
+
+  it('marks message unseen only if fully visible', async () => {
+    const mentee = accountFixtures.mentees[0];
+    await APISignUpMentee(mentee);
+    const mentor = accountFixtures.mentors[0];
+    await APISignUpMentor(mentor);
+
+    const {
+      sender_id: menteeId,
+      recipient_id: mentorId,
+      senderHeaders: menteeHeaders,
+    } = await APIGetSendInfo(mentee, mentor);
+    await sendMultiple(menteeId, mentorId, menteeHeaders, 'Hello', 10);
+
+    await signIn(mentor);
+    await element(by.id('tabs.chats')).tap();
+    await element(by.text(mentee.displayName)).tap();
+
+    await expect(element(by.text('Hello 0'))).not.toBeVisible();
+    await expect(element(by.text('Hello 9'))).toBeVisible();
+
+    await element(by.id('chat.back.button')).tap();
+    await expect(element(by.id('main.tabs.unseenDot'))).toBeVisible();
+  });
 });
diff --git a/e2e/fixtures/accounts.json b/e2e/fixtures/accounts.json
index ff88e367..71793986 100644
--- a/e2e/fixtures/accounts.json
+++ b/e2e/fixtures/accounts.json
@@ -9,10 +9,17 @@
         },
         {
             "loginName": "mentee1",
-            "displayName": "mentee1_nick",
+            "displayName": "mentee_mummo",
             "password": "Menteementee!",
             "email": "mentee1@mentee.mentee",
             "role": "mentee"
+        },
+        {
+            "loginName": "mentee2",
+            "displayName": "mentee_seppo",
+            "password": "Menteementee!",
+            "email": "mentee2@mentee.mentee",
+            "role": "mentee"
         }
     ],
     "mentors": [
diff --git a/e2e/helpers.ts b/e2e/helpers.ts
index 86501eee..4f097f3d 100644
--- a/e2e/helpers.ts
+++ b/e2e/helpers.ts
@@ -1,4 +1,5 @@
 import { by, element, waitFor, device } from 'detox';
+import { NativeMatcher } from 'detox/detox';
 import { generateToken } from 'node-2fa';
 
 const API_URL = process.env.YLITSE_API_URL || 'http://127.0.0.1:8080';
@@ -521,3 +522,17 @@ export async function APIUpdateMentor(mentorName: string, mentor: any) {
     body: JSON.stringify(updatedMentor),
   });
 }
+
+export async function detoxElementCount(matcher: NativeMatcher) {
+  try {
+    const attributes = await element(matcher)?.getAttributes();
+
+    if ('elements' in attributes) {
+      return attributes.elements.length;
+    } else {
+      return 1;
+    }
+  } catch (e) {
+    return 0;
+  }
+}
diff --git a/src/Screens/Main/Chat/MessageList/index.tsx b/src/Screens/Main/Chat/MessageList/index.tsx
index 332a78d2..a1ad24c8 100644
--- a/src/Screens/Main/Chat/MessageList/index.tsx
+++ b/src/Screens/Main/Chat/MessageList/index.tsx
@@ -116,8 +116,6 @@ export const MessageList = ({
       )
       .map<messageApi.Message>(({ item }) => item.value);
 
-    console.log('changed', unSeenMessagesOnScreen);
-
     dispatch(markSeen({ messages: unSeenMessagesOnScreen }));
   };
 
diff --git a/src/Screens/Main/MentorCardExpanded.tsx b/src/Screens/Main/MentorCardExpanded.tsx
index bbed7c78..7d5c27ca 100644
--- a/src/Screens/Main/MentorCardExpanded.tsx
+++ b/src/Screens/Main/MentorCardExpanded.tsx
@@ -101,6 +101,7 @@ const MentorCardExpanded = ({ navigation, route }: Props) => {
             style={styles.button}
             onPress={shouldNavigateBack ? goBack : navigateToChat}
             messageId="main.mentorCardExpanded.button"
+            testID="main.mentorCardExpanded.button"
             disabled={isChatDisabled || isMe}
           />
         </SafeAreaView>
diff --git a/src/Screens/components/MentorCard.tsx b/src/Screens/components/MentorCard.tsx
index 5d6d96e0..bc04060e 100644
--- a/src/Screens/components/MentorCard.tsx
+++ b/src/Screens/components/MentorCard.tsx
@@ -52,6 +52,7 @@ const MentorCard: React.FC<Props> = ({ onPress, style, mentor }) => {
           <Button
             style={styles.button}
             messageId="components.mentorCard.readMore"
+            testID="components.mentorCard.readMore"
             onPress={() => onPress(mentor)}
           />
         </RN.View>
diff --git a/src/api/messages.ts b/src/api/messages.ts
index 74663df1..46f25683 100644
--- a/src/api/messages.ts
+++ b/src/api/messages.ts
@@ -209,7 +209,6 @@ export const getParamsForUnreadMessages = (
   messages: MessageMapping,
   params: PollingParams,
 ): Array<PollingParams> => {
-  console.log('getParamsForUnreadMessages');
   switch (params.type) {
     case 'OlderThan': {
       return getOlderThanParamsIfHasUnread(messages)(params.buddyId);
@@ -228,7 +227,6 @@ export const getParamsForUnreadMessages = (
 export const getOlderThanParamsIfHasUnread =
   (messages: MessageMapping) =>
   (buddyId: string): Array<PollingParams> => {
-    console.log('getOlderThanParamsIfHasUnread for buddyId:', buddyId);
     const buddyMessages = messages[buddyId] ?? {};
 
     const sorted = Object.keys(buddyMessages).map(
@@ -237,8 +235,6 @@ export const getOlderThanParamsIfHasUnread =
 
     const hasUnread = sorted.some(message => !message.isSeen);
 
-    console.log('hasUnread', hasUnread);
-
     return hasUnread
       ? [{ type: 'OlderThan', buddyId, messageId: sorted[0].messageId }]
       : [];
diff --git a/src/state/reducers/markSeen.ts b/src/state/reducers/markSeen.ts
index 4e17d135..8cd24725 100644
--- a/src/state/reducers/markSeen.ts
+++ b/src/state/reducers/markSeen.ts
@@ -26,8 +26,6 @@ export const reducer: automaton.Reducer<State, actions.Action> = (
 
       const [first, ...messages] = action.payload.messages;
 
-      console.log('markSeen action for message', first.content);
-
       const nextState =
         first.messageId in state || first.isSeen || first.type === 'Sent'
           ? state
diff --git a/src/state/reducers/messages.ts b/src/state/reducers/messages.ts
index 826f9dd4..d85db960 100644
--- a/src/state/reducers/messages.ts
+++ b/src/state/reducers/messages.ts
@@ -102,16 +102,12 @@ export const reducer: automaton.Reducer<State, actions.Action> = (
       //  - mentor opens chat
       // case 2: marking unread message
       // case 3: marking unread only for messages that are seen 100%
-      console.log('got messages', newMessages);
 
       const newOlderThanParams = messageApi.getParamsForUnreadMessages(
         newMessages,
         state.currentParams,
       );
 
-      console.log('polled with', state.currentParams);
-      console.log('new older than params', newOlderThanParams);
-
       const [nextCurrent, nextQueue] = messageApi.getNextParams(
         action.payload,
         state.pollingQueue,