diff --git a/src/legacy/status_im/chat/models/loading.cljs b/src/legacy/status_im/chat/models/loading.cljs
index 43878c0a48b..e98a6220a85 100644
--- a/src/legacy/status_im/chat/models/loading.cljs
+++ b/src/legacy/status_im/chat/models/loading.cljs
@@ -4,7 +4,7 @@
     [legacy.status-im.data-store.messages :as data-store.messages]
     [re-frame.core :as re-frame]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.list.events :as message-list]
+    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
 
diff --git a/src/legacy/status_im/chat/models/message.cljs b/src/legacy/status_im/chat/models/message.cljs
index 19ac79e78d9..8031c9beb89 100644
--- a/src/legacy/status_im/chat/models/message.cljs
+++ b/src/legacy/status_im/chat/models/message.cljs
@@ -6,9 +6,9 @@
     [legacy.status-im.utils.deprecated-types :as types]
     [re-frame.core :as re-frame]
     [react-native.platform :as platform]
-    [status-im.contexts.chat.messages.delete-message.events :as delete-message]
-    [status-im.contexts.chat.messages.list.events :as message-list]
-    [status-im.contexts.chat.messages.list.state :as view.state]
+    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
+    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
+    [status-im.contexts.chat.messenger.messages.list.state :as view.state]
     [utils.re-frame :as rf]))
 
 (defn- message-loaded?
diff --git a/src/legacy/status_im/chat/models/message_test.cljs b/src/legacy/status_im/chat/models/message_test.cljs
index d2049f4c3c3..dd0f994c76c 100644
--- a/src/legacy/status_im/chat/models/message_test.cljs
+++ b/src/legacy/status_im/chat/models/message_test.cljs
@@ -3,7 +3,7 @@
     [cljs.test :refer-macros [deftest is testing]]
     [legacy.status-im.chat.models.loading :as loading]
     [legacy.status-im.chat.models.message :as message]
-    [status-im.contexts.chat.messages.list.state :as list.state]))
+    [status-im.contexts.chat.messenger.messages.list.state :as list.state]))
 
 (deftest add-received-message-test
   (with-redefs [message/add-message #(identity %1)]
diff --git a/src/legacy/status_im/contact/block.cljs b/src/legacy/status_im/contact/block.cljs
index 613ff26467d..7b130377cf4 100644
--- a/src/legacy/status_im/contact/block.cljs
+++ b/src/legacy/status_im/contact/block.cljs
@@ -5,7 +5,7 @@
     [legacy.status-im.utils.deprecated-types :as types]
     [re-frame.core :as re-frame]
     [status-im.contexts.chat.contacts.events :as contacts-store]
-    [status-im.contexts.chat.messages.list.events :as message-list]
+    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
     [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.navigation.events :as navigation]
     [utils.re-frame :as rf]))
diff --git a/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs b/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs
index cd35bd4ee58..55df7b578b9 100644
--- a/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs
+++ b/src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs
@@ -9,8 +9,8 @@
     [quo.foundations.typography :as typography]
     [react-native.core :as rn]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.delete-message-for-me.events]
-    [status-im.contexts.chat.messages.delete-message.events]
+    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events]
+    [status-im.contexts.chat.messenger.messages.delete-message.events]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf])
   (:require-macros [legacy.status-im.utils.views :refer [defview letsubs]]))
diff --git a/src/legacy/status_im/ui/screens/link_previews_settings/views.cljs b/src/legacy/status_im/ui/screens/link_previews_settings/views.cljs
index a1efcafa57a..ba3961fe6f2 100644
--- a/src/legacy/status_im/ui/screens/link_previews_settings/views.cljs
+++ b/src/legacy/status_im/ui/screens/link_previews_settings/views.cljs
@@ -8,7 +8,7 @@
     [legacy.status-im.ui.components.react :as react]
     [legacy.status-im.ui.screens.link-previews-settings.styles :as styles]
     [re-frame.core :as re-frame]
-    [status-im.contexts.chat.messages.link-preview.events]
+    [status-im.contexts.chat.messenger.messages.link-preview.events]
     [utils.i18n :as i18n]))
 
 (defn prepare-urls-items-data
diff --git a/src/status_im/common/signals/events.cljs b/src/status_im/common/signals/events.cljs
index 18599b2b4f8..a0099996837 100644
--- a/src/status_im/common/signals/events.cljs
+++ b/src/status_im/common/signals/events.cljs
@@ -5,8 +5,8 @@
     [legacy.status-im.mailserver.core :as mailserver]
     [legacy.status-im.visibility-status-updates.core :as visibility-status-updates]
     [status-im.common.pairing.events :as pairing]
-    [status-im.contexts.chat.messages.link-preview.events :as link-preview]
-    [status-im.contexts.chat.messages.transport.events :as messages.transport]
+    [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview]
+    [status-im.contexts.chat.messenger.messages.transport.events :as messages.transport]
     [status-im.contexts.communities.discover.events]
     [status-im.contexts.profile.login.events :as profile.login]
     [status-im.contexts.profile.push-notifications.local.events :as local-notifications]
diff --git a/src/status_im/contexts/chat/events.cljs b/src/status_im/contexts/chat/events.cljs
index b66ea731a84..42fe059c8a6 100644
--- a/src/status_im/contexts/chat/events.cljs
+++ b/src/status_im/contexts/chat/events.cljs
@@ -7,14 +7,14 @@
     [reagent.core :as reagent]
     [status-im.common.muting.helpers :refer [format-mute-till]]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.composer.link-preview.events :as link-preview]
     [status-im.contexts.chat.contacts.events :as contacts-store]
     status-im.contexts.chat.effects
-    status-im.contexts.chat.lightbox.events
-    status-im.contexts.chat.messages.content.reactions.events
-    [status-im.contexts.chat.messages.delete-message-for-me.events :as delete-for-me]
-    [status-im.contexts.chat.messages.delete-message.events :as delete-message]
-    [status-im.contexts.chat.messages.list.state :as chat.state]
+    [status-im.contexts.chat.messenger.composer.link-preview.events :as link-preview]
+    status-im.contexts.chat.messenger.lightbox.events
+    status-im.contexts.chat.messenger.messages.content.reactions.events
+    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events :as delete-for-me]
+    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
+    [status-im.contexts.chat.messenger.messages.list.state :as chat.state]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.datetime :as datetime]
diff --git a/src/status_im/contexts/chat/new_chat/styles.cljs b/src/status_im/contexts/chat/home/new_chat/styles.cljs
similarity index 91%
rename from src/status_im/contexts/chat/new_chat/styles.cljs
rename to src/status_im/contexts/chat/home/new_chat/styles.cljs
index 2697d939382..89ed5aab11c 100644
--- a/src/status_im/contexts/chat/new_chat/styles.cljs
+++ b/src/status_im/contexts/chat/home/new_chat/styles.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.new-chat.styles
+(ns status-im.contexts.chat.home.new-chat.styles
   (:require
     [react-native.safe-area :as safe-area]))
 
diff --git a/src/status_im/contexts/chat/new_chat/view.cljs b/src/status_im/contexts/chat/home/new_chat/view.cljs
similarity index 97%
rename from src/status_im/contexts/chat/new_chat/view.cljs
rename to src/status_im/contexts/chat/home/new_chat/view.cljs
index 2cb6f3c2901..77bbabb2875 100644
--- a/src/status_im/contexts/chat/new_chat/view.cljs
+++ b/src/status_im/contexts/chat/home/new_chat/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.new-chat.view
+(ns status-im.contexts.chat.home.new-chat.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
@@ -10,7 +10,7 @@
     [status-im.common.contact-list.view :as contact-list]
     [status-im.common.resources :as resources]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.new-chat.styles :as style]
+    [status-im.contexts.chat.home.new-chat.styles :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/camera/style.cljs b/src/status_im/contexts/chat/messenger/camera/style.cljs
similarity index 98%
rename from src/status_im/contexts/chat/camera/style.cljs
rename to src/status_im/contexts/chat/messenger/camera/style.cljs
index 89758afd8b2..88dab1192ca 100644
--- a/src/status_im/contexts/chat/camera/style.cljs
+++ b/src/status_im/contexts/chat/messenger/camera/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.camera.style
+(ns status-im.contexts.chat.messenger.camera.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]
diff --git a/src/status_im/contexts/chat/camera/view.cljs b/src/status_im/contexts/chat/messenger/camera/view.cljs
similarity index 98%
rename from src/status_im/contexts/chat/camera/view.cljs
rename to src/status_im/contexts/chat/messenger/camera/view.cljs
index 842491df980..8b10e7632df 100644
--- a/src/status_im/contexts/chat/camera/view.cljs
+++ b/src/status_im/contexts/chat/messenger/camera/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.camera.view
+(ns status-im.contexts.chat.messenger.camera.view
   (:require
     [oops.core :refer [oget]]
     [quo.core :as quo]
@@ -11,7 +11,7 @@
     [react-native.reanimated :as reanimated]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.camera.style :as style]
+    [status-im.contexts.chat.messenger.camera.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/composer/actions/style.cljs b/src/status_im/contexts/chat/messenger/composer/actions/style.cljs
similarity index 85%
rename from src/status_im/contexts/chat/composer/actions/style.cljs
rename to src/status_im/contexts/chat/messenger/composer/actions/style.cljs
index a49030edd11..705d7343900 100644
--- a/src/status_im/contexts/chat/composer/actions/style.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/actions/style.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.composer.actions.style
+(ns status-im.contexts.chat.messenger.composer.actions.style
   (:require
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.constants :as constants]))
+    [status-im.contexts.chat.messenger.composer.constants :as constants]))
 
 (def actions-container
   {:height          constants/actions-container-height
diff --git a/src/status_im/contexts/chat/composer/actions/view.cljs b/src/status_im/contexts/chat/messenger/composer/actions/view.cljs
similarity index 98%
rename from src/status_im/contexts/chat/composer/actions/view.cljs
rename to src/status_im/contexts/chat/messenger/composer/actions/view.cljs
index bef56efa054..f157cca6a80 100644
--- a/src/status_im/contexts/chat/composer/actions/view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/actions/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.actions.view
+(ns status-im.contexts.chat.messenger.composer.actions.view
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
@@ -9,8 +9,8 @@
     [status-im.common.alert.effects :as alert.effects]
     [status-im.common.device-permissions :as device-permissions]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.composer.actions.style :as style]
-    [status-im.contexts.chat.composer.constants :as comp-constants]
+    [status-im.contexts.chat.messenger.composer.actions.style :as style]
+    [status-im.contexts.chat.messenger.composer.constants :as comp-constants]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/composer/constants.cljs b/src/status_im/contexts/chat/messenger/composer/constants.cljs
similarity index 96%
rename from src/status_im/contexts/chat/composer/constants.cljs
rename to src/status_im/contexts/chat/messenger/composer/constants.cljs
index 6b593ea3160..4195575776c 100644
--- a/src/status_im/contexts/chat/composer/constants.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/constants.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.constants
+(ns status-im.contexts.chat.messenger.composer.constants
   (:require
     [quo.foundations.typography :as typography]
     [react-native.platform :as platform]))
diff --git a/src/status_im/contexts/chat/composer/edit/style.cljs b/src/status_im/contexts/chat/messenger/composer/edit/style.cljs
similarity index 86%
rename from src/status_im/contexts/chat/composer/edit/style.cljs
rename to src/status_im/contexts/chat/messenger/composer/edit/style.cljs
index 3ae9becee4f..c20b1562ed3 100644
--- a/src/status_im/contexts/chat/composer/edit/style.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/edit/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.edit.style)
+(ns status-im.contexts.chat.messenger.composer.edit.style)
 
 (def container
   {:flex-direction :row
diff --git a/src/status_im/contexts/chat/composer/edit/view.cljs b/src/status_im/contexts/chat/messenger/composer/edit/view.cljs
similarity index 84%
rename from src/status_im/contexts/chat/composer/edit/view.cljs
rename to src/status_im/contexts/chat/messenger/composer/edit/view.cljs
index d2ef69982f3..0b33024b3ba 100644
--- a/src/status_im/contexts/chat/composer/edit/view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/edit/view.cljs
@@ -1,12 +1,12 @@
-(ns status-im.contexts.chat.composer.edit.view
+(ns status-im.contexts.chat.messenger.composer.edit.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.edit.style :as style]
-    [status-im.contexts.chat.composer.utils :as utils]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.edit.style :as style]
+    [status-im.contexts.chat.messenger.composer.utils :as utils]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/composer/effects.cljs b/src/status_im/contexts/chat/messenger/composer/effects.cljs
similarity index 97%
rename from src/status_im/contexts/chat/composer/effects.cljs
rename to src/status_im/contexts/chat/messenger/composer/effects.cljs
index 110c1ef926b..f9b3d270d41 100644
--- a/src/status_im/contexts/chat/composer/effects.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/effects.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.effects
+(ns status-im.contexts.chat.messenger.composer.effects
   (:require
     [clojure.string :as string]
     [oops.core :as oops]
@@ -7,9 +7,9 @@
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.keyboard :as kb]
-    [status-im.contexts.chat.composer.utils :as utils]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.keyboard :as kb]
+    [status-im.contexts.chat.messenger.composer.utils :as utils]
     [utils.number]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/composer/events.cljs b/src/status_im/contexts/chat/messenger/composer/events.cljs
similarity index 97%
rename from src/status_im/contexts/chat/composer/events.cljs
rename to src/status_im/contexts/chat/messenger/composer/events.cljs
index 0cd274bf84e..0e7d392469d 100644
--- a/src/status_im/contexts/chat/composer/events.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/events.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.chat.composer.events
+(ns status-im.contexts.chat.messenger.composer.events
   (:require [clojure.string :as string]
             [legacy.status-im.chat.models.mentions :as mentions]
             [legacy.status-im.data-store.messages :as data-store-messages]
             [status-im.constants :as constants]
-            [status-im.contexts.chat.composer.link-preview.events :as link-preview]
-            [status-im.contexts.chat.messages.transport.events :as messages.transport]
+            [status-im.contexts.chat.messenger.composer.link-preview.events :as link-preview]
+            [status-im.contexts.chat.messenger.messages.transport.events :as messages.transport]
             [taoensso.timbre :as log]
             [utils.emojilib :as emoji]
             [utils.i18n :as i18n]
diff --git a/src/status_im/contexts/chat/composer/gesture.cljs b/src/status_im/contexts/chat/messenger/composer/gesture.cljs
similarity index 96%
rename from src/status_im/contexts/chat/composer/gesture.cljs
rename to src/status_im/contexts/chat/messenger/composer/gesture.cljs
index 1a861849925..ea8f93cae2e 100644
--- a/src/status_im/contexts/chat/composer/gesture.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/gesture.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.chat.composer.gesture
+(ns status-im.contexts.chat.messenger.composer.gesture
   (:require
     [oops.core :as oops]
     [react-native.gesture :as gesture]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.utils :as utils]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.utils :as utils]
     [utils.number]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/composer/gradients/style.cljs b/src/status_im/contexts/chat/messenger/composer/gradients/style.cljs
similarity index 89%
rename from src/status_im/contexts/chat/composer/gradients/style.cljs
rename to src/status_im/contexts/chat/messenger/composer/gradients/style.cljs
index 71cd12dccf6..fa038d2e137 100644
--- a/src/status_im/contexts/chat/composer/gradients/style.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/gradients/style.cljs
@@ -1,8 +1,8 @@
-(ns status-im.contexts.chat.composer.gradients.style
+(ns status-im.contexts.chat.messenger.composer.gradients.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.constants :as constants]))
+    [status-im.contexts.chat.messenger.composer.constants :as constants]))
 
 (defn- top-gradient-style
   [opacity z-index showing-extra-space?]
diff --git a/src/status_im/contexts/chat/composer/gradients/view.cljs b/src/status_im/contexts/chat/messenger/composer/gradients/view.cljs
similarity index 87%
rename from src/status_im/contexts/chat/composer/gradients/view.cljs
rename to src/status_im/contexts/chat/messenger/composer/gradients/view.cljs
index e7be37926bc..599b35aeb57 100644
--- a/src/status_im/contexts/chat/composer/gradients/view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/gradients/view.cljs
@@ -1,9 +1,9 @@
-(ns status-im.contexts.chat.composer.gradients.view
+(ns status-im.contexts.chat.messenger.composer.gradients.view
   (:require
     [react-native.core :as rn]
     [react-native.linear-gradient :as linear-gradient]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.gradients.style :as style]
+    [status-im.contexts.chat.messenger.composer.gradients.style :as style]
     [utils.re-frame :as rf]))
 
 (defn f-view
diff --git a/src/status_im/contexts/chat/composer/handlers.cljs b/src/status_im/contexts/chat/messenger/composer/handlers.cljs
similarity index 96%
rename from src/status_im/contexts/chat/composer/handlers.cljs
rename to src/status_im/contexts/chat/messenger/composer/handlers.cljs
index 733a62326f4..3e7de2b80f1 100644
--- a/src/status_im/contexts/chat/composer/handlers.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/handlers.cljs
@@ -1,14 +1,14 @@
-(ns status-im.contexts.chat.composer.handlers
+(ns status-im.contexts.chat.messenger.composer.handlers
   (:require
     [clojure.string :as string]
     [oops.core :as oops]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.keyboard :as kb]
-    [status-im.contexts.chat.composer.selection :as selection]
-    [status-im.contexts.chat.composer.utils :as utils]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.keyboard :as kb]
+    [status-im.contexts.chat.messenger.composer.selection :as selection]
+    [status-im.contexts.chat.messenger.composer.utils :as utils]
     [utils.debounce :as debounce]
     [utils.number]
     [utils.re-frame :as rf]))
diff --git a/src/status_im/contexts/chat/composer/images/style.cljs b/src/status_im/contexts/chat/messenger/composer/images/style.cljs
similarity index 85%
rename from src/status_im/contexts/chat/composer/images/style.cljs
rename to src/status_im/contexts/chat/messenger/composer/images/style.cljs
index 1a8330066a6..26cb831d780 100644
--- a/src/status_im/contexts/chat/composer/images/style.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/images/style.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.composer.images.style
+(ns status-im.contexts.chat.messenger.composer.images.style
   (:require
     [quo.foundations.colors :as colors]
-    [status-im.contexts.chat.composer.constants :as constants]))
+    [status-im.contexts.chat.messenger.composer.constants :as constants]))
 
 (def image-container
   {:padding-top    constants/images-padding-top
diff --git a/src/status_im/contexts/chat/composer/images/view.cljs b/src/status_im/contexts/chat/messenger/composer/images/view.cljs
similarity index 90%
rename from src/status_im/contexts/chat/composer/images/view.cljs
rename to src/status_im/contexts/chat/messenger/composer/images/view.cljs
index 0ffbdf44820..efc667bdac6 100644
--- a/src/status_im/contexts/chat/composer/images/view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/images/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.images.view
+(ns status-im.contexts.chat.messenger.composer.images.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
@@ -6,8 +6,8 @@
     [react-native.core :as rn]
     [react-native.gesture :as gesture]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.images.style :as style]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.images.style :as style]
     [utils.re-frame :as rf]))
 
 (defn image
diff --git a/src/status_im/contexts/chat/composer/keyboard.cljs b/src/status_im/contexts/chat/messenger/composer/keyboard.cljs
similarity index 97%
rename from src/status_im/contexts/chat/composer/keyboard.cljs
rename to src/status_im/contexts/chat/messenger/composer/keyboard.cljs
index 9359cfe6bf8..3339287893f 100644
--- a/src/status_im/contexts/chat/composer/keyboard.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/keyboard.cljs
@@ -1,11 +1,11 @@
-(ns status-im.contexts.chat.composer.keyboard
+(ns status-im.contexts.chat.messenger.composer.keyboard
   (:require
     [oops.core :as oops]
     [react-native.async-storage :as async-storage]
     [react-native.core :as rn]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.utils :as utils]))
+    [status-im.contexts.chat.messenger.composer.utils :as utils]))
 
 (defn get-kb-height
   [curr-height default-height]
diff --git a/src/status_im/contexts/chat/composer/link_preview/events.cljs b/src/status_im/contexts/chat/messenger/composer/link_preview/events.cljs
similarity index 98%
rename from src/status_im/contexts/chat/composer/link_preview/events.cljs
rename to src/status_im/contexts/chat/messenger/composer/link_preview/events.cljs
index 3c3af767f60..2c67867c6b0 100644
--- a/src/status_im/contexts/chat/composer/link_preview/events.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/link_preview/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.link-preview.events
+(ns status-im.contexts.chat.messenger.composer.link-preview.events
   (:require
     [clojure.set :as set]
     [clojure.string :as string]
diff --git a/src/status_im/contexts/chat/composer/link_preview/events_test.cljs b/src/status_im/contexts/chat/messenger/composer/link_preview/events_test.cljs
similarity index 98%
rename from src/status_im/contexts/chat/composer/link_preview/events_test.cljs
rename to src/status_im/contexts/chat/messenger/composer/link_preview/events_test.cljs
index 04d629df441..a20aeeee067 100644
--- a/src/status_im/contexts/chat/composer/link_preview/events_test.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/link_preview/events_test.cljs
@@ -1,8 +1,8 @@
-(ns status-im.contexts.chat.composer.link-preview.events-test
+(ns status-im.contexts.chat.messenger.composer.link-preview.events-test
   (:require
     [cljs.test :refer [deftest is testing]]
     matcher-combinators.test
-    [status-im.contexts.chat.composer.link-preview.events :as events]))
+    [status-im.contexts.chat.messenger.composer.link-preview.events :as events]))
 
 (def url-github "https://github.com")
 (def url-gitlab "https://gitlab.com")
diff --git a/src/status_im/contexts/chat/composer/link_preview/style.cljs b/src/status_im/contexts/chat/messenger/composer/link_preview/style.cljs
similarity index 71%
rename from src/status_im/contexts/chat/composer/link_preview/style.cljs
rename to src/status_im/contexts/chat/messenger/composer/link_preview/style.cljs
index 11ca462ef64..9564af255d8 100644
--- a/src/status_im/contexts/chat/composer/link_preview/style.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/link_preview/style.cljs
@@ -1,5 +1,5 @@
-(ns status-im.contexts.chat.composer.link-preview.style
-  (:require [status-im.contexts.chat.composer.constants :as constants]))
+(ns status-im.contexts.chat.messenger.composer.link-preview.style
+  (:require [status-im.contexts.chat.messenger.composer.constants :as constants]))
 
 (def padding-horizontal 20)
 (def preview-height 56)
diff --git a/src/status_im/contexts/chat/composer/link_preview/view.cljs b/src/status_im/contexts/chat/messenger/composer/link_preview/view.cljs
similarity index 85%
rename from src/status_im/contexts/chat/composer/link_preview/view.cljs
rename to src/status_im/contexts/chat/messenger/composer/link_preview/view.cljs
index c802357f652..84c61a67542 100644
--- a/src/status_im/contexts/chat/composer/link_preview/view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/link_preview/view.cljs
@@ -1,11 +1,11 @@
-(ns status-im.contexts.chat.composer.link-preview.view
+(ns status-im.contexts.chat.messenger.composer.link-preview.view
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.link-preview.events]
-    [status-im.contexts.chat.composer.link-preview.style :as style]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.link-preview.events]
+    [status-im.contexts.chat.messenger.composer.link-preview.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/composer/mentions/style.cljs b/src/status_im/contexts/chat/messenger/composer/mentions/style.cljs
similarity index 85%
rename from src/status_im/contexts/chat/composer/mentions/style.cljs
rename to src/status_im/contexts/chat/messenger/composer/mentions/style.cljs
index 287be0f2615..fd5c1e57f9b 100644
--- a/src/status_im/contexts/chat/composer/mentions/style.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/mentions/style.cljs
@@ -1,9 +1,9 @@
-(ns status-im.contexts.chat.composer.mentions.style
+(ns status-im.contexts.chat.messenger.composer.mentions.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.constants :as constants]))
+    [status-im.contexts.chat.messenger.composer.constants :as constants]))
 
 
 (defn shadow
diff --git a/src/status_im/contexts/chat/composer/mentions/view.cljs b/src/status_im/contexts/chat/messenger/composer/mentions/view.cljs
similarity index 93%
rename from src/status_im/contexts/chat/composer/mentions/view.cljs
rename to src/status_im/contexts/chat/messenger/composer/mentions/view.cljs
index f20131a6d34..4f96cb17326 100644
--- a/src/status_im/contexts/chat/composer/mentions/view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/mentions/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.mentions.view
+(ns status-im.contexts.chat.messenger.composer.mentions.view
   (:require
     [react-native.core :as rn]
     [react-native.platform :as platform]
@@ -6,8 +6,8 @@
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
     [status-im.common.contact-list-item.view :as contact-list-item]
-    [status-im.contexts.chat.composer.mentions.style :as style]
-    [status-im.contexts.chat.composer.utils :as utils]
+    [status-im.contexts.chat.messenger.composer.mentions.style :as style]
+    [status-im.contexts.chat.messenger.composer.utils :as utils]
     [utils.re-frame :as rf]))
 
 (defn update-cursor
diff --git a/src/status_im/contexts/chat/composer/reply/style.cljs b/src/status_im/contexts/chat/messenger/composer/reply/style.cljs
similarity index 94%
rename from src/status_im/contexts/chat/composer/reply/style.cljs
rename to src/status_im/contexts/chat/messenger/composer/reply/style.cljs
index beb9640d7f9..01c268946fb 100644
--- a/src/status_im/contexts/chat/composer/reply/style.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/reply/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.reply.style)
+(ns status-im.contexts.chat.messenger.composer.reply.style)
 
 
 (defn container
diff --git a/src/status_im/contexts/chat/composer/reply/view.cljs b/src/status_im/contexts/chat/messenger/composer/reply/view.cljs
similarity index 95%
rename from src/status_im/contexts/chat/composer/reply/view.cljs
rename to src/status_im/contexts/chat/messenger/composer/reply/view.cljs
index da4022ea24b..68272c6e37f 100644
--- a/src/status_im/contexts/chat/composer/reply/view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/reply/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.reply.view
+(ns status-im.contexts.chat.messenger.composer.reply.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
@@ -7,9 +7,9 @@
     [react-native.linear-gradient :as linear-gradient]
     [react-native.reanimated :as reanimated]
     [status-im.constants :as constant]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.reply.style :as style]
-    [status-im.contexts.chat.composer.utils :as utils]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.reply.style :as style]
+    [status-im.contexts.chat.messenger.composer.utils :as utils]
     [utils.ens.stateofus :as stateofus]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
diff --git a/src/status_im/contexts/chat/composer/selection.cljs b/src/status_im/contexts/chat/messenger/composer/selection.cljs
similarity index 98%
rename from src/status_im/contexts/chat/composer/selection.cljs
rename to src/status_im/contexts/chat/messenger/composer/selection.cljs
index 9b675bd2f63..5da37319192 100644
--- a/src/status_im/contexts/chat/composer/selection.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/selection.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.selection
+(ns status-im.contexts.chat.messenger.composer.selection
   (:require
     [clojure.string :as string]
     [oops.core :as oops]
diff --git a/src/status_im/contexts/chat/composer/style.cljs b/src/status_im/contexts/chat/messenger/composer/style.cljs
similarity index 96%
rename from src/status_im/contexts/chat/composer/style.cljs
rename to src/status_im/contexts/chat/messenger/composer/style.cljs
index ce39ec1a2d8..c2e42f7743b 100644
--- a/src/status_im/contexts/chat/composer/style.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/style.cljs
@@ -1,11 +1,11 @@
-(ns status-im.contexts.chat.composer.style
+(ns status-im.contexts.chat.messenger.composer.style
   (:require
     [quo.foundations.colors :as colors]
     [quo.foundations.typography :as typography]
     [quo.theme :as quo.theme]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.constants :as constants]))
+    [status-im.contexts.chat.messenger.composer.constants :as constants]))
 
 (def border-top-radius 20)
 
diff --git a/src/status_im/contexts/chat/composer/sub_view.cljs b/src/status_im/contexts/chat/messenger/composer/sub_view.cljs
similarity index 94%
rename from src/status_im/contexts/chat/composer/sub_view.cljs
rename to src/status_im/contexts/chat/messenger/composer/sub_view.cljs
index 63adb2e654d..b0c603116ae 100644
--- a/src/status_im/contexts/chat/composer/sub_view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/sub_view.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.chat.composer.sub-view
+(ns status-im.contexts.chat.messenger.composer.sub-view
   (:require
     [quo.core :as quo]
     [react-native.blur :as blur]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.composer.style :as style]
+    [status-im.contexts.chat.messenger.composer.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/composer/utils.cljs b/src/status_im/contexts/chat/messenger/composer/utils.cljs
similarity index 97%
rename from src/status_im/contexts/chat/composer/utils.cljs
rename to src/status_im/contexts/chat/messenger/composer/utils.cljs
index 1fef9d28c7f..c816f82f24c 100644
--- a/src/status_im/contexts/chat/composer/utils.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/utils.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.utils
+(ns status-im.contexts.chat.messenger.composer.utils
   (:require
     [clojure.string :as string]
     [oops.core :as oops]
@@ -6,8 +6,8 @@
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.selection :as selection]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.selection :as selection]
     [utils.number]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/composer/view.cljs b/src/status_im/contexts/chat/messenger/composer/view.cljs
similarity index 88%
rename from src/status_im/contexts/chat/composer/view.cljs
rename to src/status_im/contexts/chat/messenger/composer/view.cljs
index 02ca1cb20ad..77bac655052 100644
--- a/src/status_im/contexts/chat/composer/view.cljs
+++ b/src/status_im/contexts/chat/messenger/composer/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.composer.view
+(ns status-im.contexts.chat.messenger.composer.view
   (:require
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
@@ -8,22 +8,22 @@
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.composer.actions.view :as actions]
-    [status-im.contexts.chat.composer.constants :as constants]
-    [status-im.contexts.chat.composer.edit.view :as edit]
-    [status-im.contexts.chat.composer.effects :as effects]
-    [status-im.contexts.chat.composer.gesture :as drag-gesture]
-    [status-im.contexts.chat.composer.gradients.view :as gradients]
-    [status-im.contexts.chat.composer.handlers :as handler]
-    [status-im.contexts.chat.composer.images.view :as images]
-    [status-im.contexts.chat.composer.link-preview.view :as link-preview]
-    [status-im.contexts.chat.composer.mentions.view :as mentions]
-    [status-im.contexts.chat.composer.reply.view :as reply]
-    [status-im.contexts.chat.composer.selection :as selection]
-    [status-im.contexts.chat.composer.style :as style]
-    [status-im.contexts.chat.composer.sub-view :as sub-view]
-    [status-im.contexts.chat.composer.utils :as utils]
-    [status-im.contexts.chat.messages.contact-requests.bottom-drawer.view :as
+    [status-im.contexts.chat.messenger.composer.actions.view :as actions]
+    [status-im.contexts.chat.messenger.composer.constants :as constants]
+    [status-im.contexts.chat.messenger.composer.edit.view :as edit]
+    [status-im.contexts.chat.messenger.composer.effects :as effects]
+    [status-im.contexts.chat.messenger.composer.gesture :as drag-gesture]
+    [status-im.contexts.chat.messenger.composer.gradients.view :as gradients]
+    [status-im.contexts.chat.messenger.composer.handlers :as handler]
+    [status-im.contexts.chat.messenger.composer.images.view :as images]
+    [status-im.contexts.chat.messenger.composer.link-preview.view :as link-preview]
+    [status-im.contexts.chat.messenger.composer.mentions.view :as mentions]
+    [status-im.contexts.chat.messenger.composer.reply.view :as reply]
+    [status-im.contexts.chat.messenger.composer.selection :as selection]
+    [status-im.contexts.chat.messenger.composer.style :as style]
+    [status-im.contexts.chat.messenger.composer.sub-view :as sub-view]
+    [status-im.contexts.chat.messenger.composer.utils :as utils]
+    [status-im.contexts.chat.messenger.messages.contact-requests.bottom-drawer.view :as
      contact-requests.bottom-drawer]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
diff --git a/src/status_im/contexts/chat/lightbox/animations.cljs b/src/status_im/contexts/chat/messenger/lightbox/animations.cljs
similarity index 92%
rename from src/status_im/contexts/chat/lightbox/animations.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/animations.cljs
index 4e3d29fccf0..0f06dde7adf 100644
--- a/src/status_im/contexts/chat/lightbox/animations.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/animations.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.animations
+(ns status-im.contexts.chat.messenger.lightbox.animations
   (:require
     [react-native.reanimated :as reanimated]))
 
diff --git a/src/status_im/contexts/chat/lightbox/bottom_view.cljs b/src/status_im/contexts/chat/messenger/lightbox/bottom_view.cljs
similarity index 91%
rename from src/status_im/contexts/chat/lightbox/bottom_view.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/bottom_view.cljs
index b24c8137ec7..3a01c1c0a44 100644
--- a/src/status_im/contexts/chat/lightbox/bottom_view.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/bottom_view.cljs
@@ -1,13 +1,13 @@
-(ns status-im.contexts.chat.lightbox.bottom-view
+(ns status-im.contexts.chat.messenger.lightbox.bottom-view
   (:require
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.lightbox.animations :as anim]
-    [status-im.contexts.chat.lightbox.constants :as c]
-    [status-im.contexts.chat.lightbox.style :as style]
-    [status-im.contexts.chat.lightbox.text-sheet.view :as text-sheet]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.view :as text-sheet]
     [utils.re-frame :as rf]))
 
 (defn get-small-item-layout
diff --git a/src/status_im/contexts/chat/lightbox/constants.cljs b/src/status_im/contexts/chat/messenger/lightbox/constants.cljs
similarity index 89%
rename from src/status_im/contexts/chat/lightbox/constants.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/constants.cljs
index f659e75467a..1af54b2c402 100644
--- a/src/status_im/contexts/chat/lightbox/constants.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/constants.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.constants)
+(ns status-im.contexts.chat.messenger.lightbox.constants)
 
 (def ^:const small-image-size 40)
 (def ^:const focused-extra-size 16)
diff --git a/src/status_im/contexts/chat/lightbox/effects.cljs b/src/status_im/contexts/chat/messenger/lightbox/effects.cljs
similarity index 94%
rename from src/status_im/contexts/chat/lightbox/effects.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/effects.cljs
index 0a0171648dd..6effa3d9cfa 100644
--- a/src/status_im/contexts/chat/lightbox/effects.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/effects.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.effects
+(ns status-im.contexts.chat.messenger.lightbox.effects
   (:require [react-native.blob :as blob]
             [react-native.cameraroll :as cameraroll]
             [react-native.fs :as fs]
diff --git a/src/status_im/contexts/chat/lightbox/events.cljs b/src/status_im/contexts/chat/messenger/lightbox/events.cljs
similarity index 86%
rename from src/status_im/contexts/chat/lightbox/events.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/events.cljs
index 3f23b53a116..765eead1f1b 100644
--- a/src/status_im/contexts/chat/lightbox/events.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/events.cljs
@@ -1,5 +1,5 @@
-(ns status-im.contexts.chat.lightbox.events
-  (:require status-im.contexts.chat.lightbox.effects
+(ns status-im.contexts.chat.messenger.lightbox.events
+  (:require status-im.contexts.chat.messenger.lightbox.effects
             [utils.re-frame :as rf]))
 
 (rf/reg-event-fx :chat.ui/clear-sending-images
diff --git a/src/status_im/contexts/chat/lightbox/style.cljs b/src/status_im/contexts/chat/messenger/lightbox/style.cljs
similarity index 96%
rename from src/status_im/contexts/chat/lightbox/style.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/style.cljs
index 9ef96aeb05a..ace3e743db1 100644
--- a/src/status_im/contexts/chat/lightbox/style.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/style.cljs
@@ -1,9 +1,9 @@
-(ns status-im.contexts.chat.lightbox.style
+(ns status-im.contexts.chat.messenger.lightbox.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.lightbox.constants :as c]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as c]))
 
 ;;;; VIEW
 (defn image
diff --git a/src/status_im/contexts/chat/lightbox/text_sheet/style.cljs b/src/status_im/contexts/chat/messenger/lightbox/text_sheet/style.cljs
similarity index 93%
rename from src/status_im/contexts/chat/lightbox/text_sheet/style.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/text_sheet/style.cljs
index 45115fa3532..181b0dad019 100644
--- a/src/status_im/contexts/chat/lightbox/text_sheet/style.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/text_sheet/style.cljs
@@ -1,8 +1,8 @@
-(ns status-im.contexts.chat.lightbox.text-sheet.style
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.lightbox.constants :as constants]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]))
 
 (defn sheet-container
   [{:keys [height top]}]
diff --git a/src/status_im/contexts/chat/lightbox/text_sheet/utils.cljs b/src/status_im/contexts/chat/messenger/lightbox/text_sheet/utils.cljs
similarity index 96%
rename from src/status_im/contexts/chat/lightbox/text_sheet/utils.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/text_sheet/utils.cljs
index b5dde07a977..a1fa8e78707 100644
--- a/src/status_im/contexts/chat/lightbox/text_sheet/utils.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/text_sheet/utils.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.chat.lightbox.text-sheet.utils
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.utils
   (:require
     [oops.core :as oops]
     [react-native.gesture :as gesture]
     [react-native.reanimated :as reanimated]
     [reagent.core :as r]
-    [status-im.contexts.chat.lightbox.constants :as constants]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]))
 
 (defn- collapse-sheet
   [{:keys [derived-value overlay-opacity saved-top expanded? overlay-z-index]}]
diff --git a/src/status_im/contexts/chat/lightbox/text_sheet/view.cljs b/src/status_im/contexts/chat/messenger/lightbox/text_sheet/view.cljs
similarity index 92%
rename from src/status_im/contexts/chat/lightbox/text_sheet/view.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/text_sheet/view.cljs
index 2fef4ffdecf..16e5113a0b9 100644
--- a/src/status_im/contexts/chat/lightbox/text_sheet/view.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/text_sheet/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.text-sheet.view
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.view
   (:require
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
@@ -8,10 +8,10 @@
     [react-native.reanimated :as reanimated]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.lightbox.constants :as constants]
-    [status-im.contexts.chat.lightbox.text-sheet.style :as style]
-    [status-im.contexts.chat.lightbox.text-sheet.utils :as utils]
-    [status-im.contexts.chat.messages.content.text.view :as message-view]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.utils :as utils]
+    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]))
 
 (defn- text-sheet
   [messages overlay-opacity overlay-z-index text-sheet-lock?]
diff --git a/src/status_im/contexts/chat/lightbox/top_view.cljs b/src/status_im/contexts/chat/messenger/lightbox/top_view.cljs
similarity index 95%
rename from src/status_im/contexts/chat/lightbox/top_view.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/top_view.cljs
index 423b67cb5c1..5fb1fa2143b 100644
--- a/src/status_im/contexts/chat/lightbox/top_view.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/top_view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.top-view
+(ns status-im.contexts.chat.messenger.lightbox.top-view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
@@ -6,9 +6,9 @@
     [react-native.orientation :as orientation]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.lightbox.animations :as anim]
-    [status-im.contexts.chat.lightbox.constants :as c]
-    [status-im.contexts.chat.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
     [utils.datetime :as datetime]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
diff --git a/src/status_im/contexts/chat/lightbox/utils.cljs b/src/status_im/contexts/chat/messenger/lightbox/utils.cljs
similarity index 96%
rename from src/status_im/contexts/chat/lightbox/utils.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/utils.cljs
index eb0ece41ba1..7040330b5bd 100644
--- a/src/status_im/contexts/chat/lightbox/utils.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/utils.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.utils
+(ns status-im.contexts.chat.messenger.lightbox.utils
   (:require
     [clojure.string :as string]
     [oops.core :as oops]
@@ -9,9 +9,9 @@
     [react-native.platform :as platform]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.lightbox.animations :as anim]
-    [status-im.contexts.chat.lightbox.constants :as constants]
-    [status-im.contexts.chat.lightbox.top-view :as top-view]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.top-view :as top-view]
     [utils.re-frame :as rf]
     [utils.worklets.chat.lightbox :as worklet]))
 
diff --git a/src/status_im/contexts/chat/lightbox/view.cljs b/src/status_im/contexts/chat/messenger/lightbox/view.cljs
similarity index 92%
rename from src/status_im/contexts/chat/lightbox/view.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/view.cljs
index 81eb4b643a9..29af399328b 100644
--- a/src/status_im/contexts/chat/lightbox/view.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.view
+(ns status-im.contexts.chat.messenger.lightbox.view
   (:require
     [clojure.string :as string]
     [oops.core :as oops]
@@ -9,13 +9,13 @@
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [react-native.safe-area :as safe-area]
-    [status-im.contexts.chat.lightbox.animations :as anim]
-    [status-im.contexts.chat.lightbox.bottom-view :as bottom-view]
-    [status-im.contexts.chat.lightbox.constants :as constants]
-    [status-im.contexts.chat.lightbox.style :as style]
-    [status-im.contexts.chat.lightbox.top-view :as top-view]
-    [status-im.contexts.chat.lightbox.utils :as utils]
-    [status-im.contexts.chat.lightbox.zoomable-image.view :as zoomable-image]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.bottom-view :as bottom-view]
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.top-view :as top-view]
+    [status-im.contexts.chat.messenger.lightbox.utils :as utils]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.view :as zoomable-image]
     [utils.re-frame :as rf]))
 
 (defn get-item-layout
diff --git a/src/status_im/contexts/chat/lightbox/zoomable_image/constants.cljs b/src/status_im/contexts/chat/messenger/lightbox/zoomable_image/constants.cljs
similarity index 79%
rename from src/status_im/contexts/chat/lightbox/zoomable_image/constants.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/zoomable_image/constants.cljs
index b297f92a8e1..8b1668e3a7a 100644
--- a/src/status_im/contexts/chat/lightbox/zoomable_image/constants.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/zoomable_image/constants.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.zoomable-image.constants)
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.constants)
 
 (def ^:const min-scale 1)
 
diff --git a/src/status_im/contexts/chat/lightbox/zoomable_image/style.cljs b/src/status_im/contexts/chat/messenger/lightbox/zoomable_image/style.cljs
similarity index 94%
rename from src/status_im/contexts/chat/lightbox/zoomable_image/style.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/zoomable_image/style.cljs
index a228596d7d9..4280de76406 100644
--- a/src/status_im/contexts/chat/lightbox/zoomable_image/style.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/zoomable_image/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.zoomable-image.style
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.style
   (:require
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]))
diff --git a/src/status_im/contexts/chat/lightbox/zoomable_image/utils.cljs b/src/status_im/contexts/chat/messenger/lightbox/zoomable_image/utils.cljs
similarity index 97%
rename from src/status_im/contexts/chat/lightbox/zoomable_image/utils.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/zoomable_image/utils.cljs
index 510603d1200..46381459f6b 100644
--- a/src/status_im/contexts/chat/lightbox/zoomable_image/utils.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/zoomable_image/utils.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.zoomable-image.utils
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.utils
   (:require
     [clojure.string :as string]
     [react-native.core :as rn]
@@ -6,8 +6,8 @@
     [react-native.orientation :as orientation]
     [react-native.platform :as platform]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.lightbox.animations :as anim]
-    [status-im.contexts.chat.lightbox.zoomable-image.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.constants :as constants]
     [utils.re-frame :as rf]))
 
 ;;; Helpers
diff --git a/src/status_im/contexts/chat/lightbox/zoomable_image/view.cljs b/src/status_im/contexts/chat/messenger/lightbox/zoomable_image/view.cljs
similarity index 97%
rename from src/status_im/contexts/chat/lightbox/zoomable_image/view.cljs
rename to src/status_im/contexts/chat/messenger/lightbox/zoomable_image/view.cljs
index f6bb14cb4b3..49681ae5082 100644
--- a/src/status_im/contexts/chat/lightbox/zoomable_image/view.cljs
+++ b/src/status_im/contexts/chat/messenger/lightbox/zoomable_image/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.lightbox.zoomable-image.view
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.view
   (:require
     [oops.core :refer [oget]]
     [react-native.core :as rn]
@@ -7,10 +7,10 @@
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [reagent.core :as r]
-    [status-im.contexts.chat.lightbox.animations :as anim]
-    [status-im.contexts.chat.lightbox.zoomable-image.constants :as c]
-    [status-im.contexts.chat.lightbox.zoomable-image.style :as style]
-    [status-im.contexts.chat.lightbox.zoomable-image.utils :as utils]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.utils :as utils]
     [utils.re-frame :as rf]
     [utils.url :as url]))
 
diff --git a/src/status_im/contexts/chat/menus/pinned_messages/style.cljs b/src/status_im/contexts/chat/messenger/menus/pinned_messages/style.cljs
similarity index 95%
rename from src/status_im/contexts/chat/menus/pinned_messages/style.cljs
rename to src/status_im/contexts/chat/messenger/menus/pinned_messages/style.cljs
index 13a98c22a65..b97d83f60eb 100644
--- a/src/status_im/contexts/chat/menus/pinned_messages/style.cljs
+++ b/src/status_im/contexts/chat/messenger/menus/pinned_messages/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.menus.pinned-messages.style
+(ns status-im.contexts.chat.messenger.menus.pinned-messages.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]))
diff --git a/src/status_im/contexts/chat/menus/pinned_messages/view.cljs b/src/status_im/contexts/chat/messenger/menus/pinned_messages/view.cljs
similarity index 93%
rename from src/status_im/contexts/chat/menus/pinned_messages/view.cljs
rename to src/status_im/contexts/chat/messenger/menus/pinned_messages/view.cljs
index 4c26c9f41d0..e3f05e4674b 100644
--- a/src/status_im/contexts/chat/menus/pinned_messages/view.cljs
+++ b/src/status_im/contexts/chat/messenger/menus/pinned_messages/view.cljs
@@ -1,12 +1,12 @@
-(ns status-im.contexts.chat.menus.pinned-messages.view
+(ns status-im.contexts.chat.messenger.menus.pinned-messages.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [react-native.fast-image :as fast-image]
     [react-native.gesture :as gesture]
-    [status-im.contexts.chat.menus.pinned-messages.style :as style]
-    [status-im.contexts.chat.messages.content.view :as message]
+    [status-im.contexts.chat.messenger.menus.pinned-messages.style :as style]
+    [status-im.contexts.chat.messenger.messages.content.view :as message]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/messages/avatar/view.cljs b/src/status_im/contexts/chat/messenger/messages/avatar/view.cljs
similarity index 92%
rename from src/status_im/contexts/chat/messages/avatar/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/avatar/view.cljs
index 0fc187ae9b1..59f74440b8e 100644
--- a/src/status_im/contexts/chat/messages/avatar/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/avatar/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.avatar.view
+(ns status-im.contexts.chat.messenger.messages.avatar.view
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
diff --git a/src/status_im/contexts/chat/messages/constants.cljs b/src/status_im/contexts/chat/messenger/messages/constants.cljs
similarity index 90%
rename from src/status_im/contexts/chat/messages/constants.cljs
rename to src/status_im/contexts/chat/messenger/messages/constants.cljs
index 0516eac7bfb..c7f81528677 100644
--- a/src/status_im/contexts/chat/messages/constants.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/constants.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.constants)
+(ns status-im.contexts.chat.messenger.messages.constants)
 
 ;;;; Navigation
 (def ^:const top-bar-height 56)
diff --git a/src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs b/src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/style.cljs
similarity index 50%
rename from src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/style.cljs
index 033c8c48187..751c0beb18e 100644
--- a/src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.contact-requests.bottom-drawer.style)
+(ns status-im.contexts.chat.messenger.messages.contact-requests.bottom-drawer.style)
 
 (def container
   {:position :absolute
diff --git a/src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs b/src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/view.cljs
similarity index 90%
rename from src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/view.cljs
index e43207a223e..e19f17ae06c 100644
--- a/src/status_im/contexts/chat/messages/contact_requests/bottom_drawer/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/contact_requests/bottom_drawer/view.cljs
@@ -1,9 +1,9 @@
-(ns status-im.contexts.chat.messages.contact-requests.bottom-drawer.view
+(ns status-im.contexts.chat.messenger.messages.contact-requests.bottom-drawer.view
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.contact-requests.bottom-drawer.style :as style]
+    [status-im.contexts.chat.messenger.messages.contact-requests.bottom-drawer.style :as style]
     [status-im.contexts.shell.jump-to.constants :as jump-to.constants]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
diff --git a/src/status_im/contexts/chat/messages/content/album/style.cljs b/src/status_im/contexts/chat/messenger/messages/content/album/style.cljs
similarity index 93%
rename from src/status_im/contexts/chat/messages/content/album/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/album/style.cljs
index 89b14337d0b..afe483a5ff8 100644
--- a/src/status_im/contexts/chat/messages/content/album/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/album/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.album.style
+(ns status-im.contexts.chat.messenger.messages.content.album.style
   (:require
     [quo.foundations.colors :as colors]
     [status-im.constants :as constants]))
diff --git a/src/status_im/contexts/chat/messages/content/album/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/album/view.cljs
similarity index 92%
rename from src/status_im/contexts/chat/messages/content/album/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/album/view.cljs
index 0ab04e9b7d0..4dbca7ce76d 100644
--- a/src/status_im/contexts/chat/messages/content/album/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/album/view.cljs
@@ -1,13 +1,13 @@
-(ns status-im.contexts.chat.messages.content.album.view
+(ns status-im.contexts.chat.messenger.messages.content.album.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [react-native.fast-image :as fast-image]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.content.album.style :as style]
-    [status-im.contexts.chat.messages.content.image.view :as image]
-    [status-im.contexts.chat.messages.content.text.view :as text]
+    [status-im.contexts.chat.messenger.messages.content.album.style :as style]
+    [status-im.contexts.chat.messenger.messages.content.image.view :as image]
+    [status-im.contexts.chat.messenger.messages.content.text.view :as text]
     [utils.re-frame :as rf]
     [utils.url :as url]))
 
diff --git a/src/status_im/contexts/chat/messages/content/audio/component_spec.cljs b/src/status_im/contexts/chat/messenger/messages/content/audio/component_spec.cljs
similarity index 92%
rename from src/status_im/contexts/chat/messages/content/audio/component_spec.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/audio/component_spec.cljs
index ec7fd7ad016..ffefe272d5c 100644
--- a/src/status_im/contexts/chat/messages/content/audio/component_spec.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/audio/component_spec.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.messages.content.audio.component-spec
+(ns status-im.contexts.chat.messenger.messages.content.audio.component-spec
   (:require
     [react-native.audio-toolkit :as audio]
-    [status-im.contexts.chat.messages.content.audio.view :as audio-message]
+    [status-im.contexts.chat.messenger.messages.content.audio.view :as audio-message]
     [test-helpers.component :as h]))
 
 ;; We can't rely on `with-redefs` with async code.
diff --git a/src/status_im/contexts/chat/messages/content/audio/style.cljs b/src/status_im/contexts/chat/messenger/messages/content/audio/style.cljs
similarity index 93%
rename from src/status_im/contexts/chat/messages/content/audio/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/audio/style.cljs
index 53f3cf9dcea..31f772b5ab5 100644
--- a/src/status_im/contexts/chat/messages/content/audio/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/audio/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.audio.style
+(ns status-im.contexts.chat.messenger.messages.content.audio.style
   (:require
     [quo.foundations.colors :as colors]
     [quo.theme :as theme]))
diff --git a/src/status_im/contexts/chat/messages/content/audio/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/audio/view.cljs
similarity index 98%
rename from src/status_im/contexts/chat/messages/content/audio/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/audio/view.cljs
index a27700dbe71..5de4163847c 100644
--- a/src/status_im/contexts/chat/messages/content/audio/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/audio/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.audio.view
+(ns status-im.contexts.chat.messenger.messages.content.audio.view
   (:require
     ["react-native-blob-util" :default ReactNativeBlobUtil]
     [goog.string :as gstring]
@@ -9,7 +9,7 @@
     [react-native.platform :as platform]
     [reagent.core :as reagent]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.content.audio.style :as style]
+    [status-im.contexts.chat.messenger.messages.content.audio.style :as style]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
diff --git a/src/status_im/contexts/chat/messages/content/deleted/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/deleted/view.cljs
similarity index 98%
rename from src/status_im/contexts/chat/messages/content/deleted/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/deleted/view.cljs
index 800b062901f..b4ac2901226 100644
--- a/src/status_im/contexts/chat/messages/content/deleted/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/deleted/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.deleted.view
+(ns status-im.contexts.chat.messenger.messages.content.deleted.view
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
diff --git a/src/status_im/contexts/chat/messages/content/image/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/image/view.cljs
similarity index 95%
rename from src/status_im/contexts/chat/messages/content/image/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/image/view.cljs
index fbd8f2f5c71..d3cf723b55e 100644
--- a/src/status_im/contexts/chat/messages/content/image/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/image/view.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.chat.messages.content.image.view
+(ns status-im.contexts.chat.messenger.messages.content.image.view
   (:require
     [react-native.core :as rn]
     [react-native.fast-image :as fast-image]
     [react-native.safe-area :as safe-area]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.content.text.view :as text]
+    [status-im.contexts.chat.messenger.messages.content.text.view :as text]
     [utils.re-frame :as rf]
     [utils.url :as url]))
 
diff --git a/src/status_im/contexts/chat/messages/content/link_preview/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/link_preview/view.cljs
similarity index 91%
rename from src/status_im/contexts/chat/messages/content/link_preview/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/link_preview/view.cljs
index 957c7f565df..e4397dc8d67 100644
--- a/src/status_im/contexts/chat/messages/content/link_preview/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/link_preview/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.link-preview.view
+(ns status-im.contexts.chat.messenger.messages.content.link-preview.view
   (:require
     [quo.core :as quo]
     [utils.re-frame :as rf]))
diff --git a/src/status_im/contexts/chat/messages/content/link_preview/view_test.cljs b/src/status_im/contexts/chat/messenger/messages/content/link_preview/view_test.cljs
similarity index 67%
rename from src/status_im/contexts/chat/messages/content/link_preview/view_test.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/link_preview/view_test.cljs
index b5e83140270..1c204dfe81f 100644
--- a/src/status_im/contexts/chat/messages/content/link_preview/view_test.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/link_preview/view_test.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.messages.content.link-preview.view-test
+(ns status-im.contexts.chat.messenger.messages.content.link-preview.view-test
   (:require
     [cljs.test :refer [are deftest is]]
-    [status-im.contexts.chat.messages.content.link-preview.view :as view]))
+    [status-im.contexts.chat.messenger.messages.content.link-preview.view :as view]))
 
 (deftest nearly-square?-test
   (are [pred width height] (is (pred (view/nearly-square? {:width width :height height})))
diff --git a/src/status_im/contexts/chat/messages/content/pin/style.cljs b/src/status_im/contexts/chat/messenger/messages/content/pin/style.cljs
similarity index 94%
rename from src/status_im/contexts/chat/messages/content/pin/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/pin/style.cljs
index abcb7a8eb23..e7159c0f2a1 100644
--- a/src/status_im/contexts/chat/messages/content/pin/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/pin/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.pin.style
+(ns status-im.contexts.chat.messenger.messages.content.pin.style
   (:require
     [quo.foundations.colors :as colors]))
 
diff --git a/src/status_im/contexts/chat/messages/content/pin/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/pin/view.cljs
similarity index 86%
rename from src/status_im/contexts/chat/messages/content/pin/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/pin/view.cljs
index 9bb5c4a850d..95e7a5e59a7 100644
--- a/src/status_im/contexts/chat/messages/content/pin/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/pin/view.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.chat.messages.content.pin.view
+(ns status-im.contexts.chat.messenger.messages.content.pin.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
-    [status-im.contexts.chat.composer.reply.view :as reply]
-    [status-im.contexts.chat.messages.content.pin.style :as style]
+    [status-im.contexts.chat.messenger.composer.reply.view :as reply]
+    [status-im.contexts.chat.messenger.messages.content.pin.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/messages/content/reactions/events.cljs b/src/status_im/contexts/chat/messenger/messages/content/reactions/events.cljs
similarity index 98%
rename from src/status_im/contexts/chat/messages/content/reactions/events.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/reactions/events.cljs
index aaaab2d0377..3368fe391c9 100644
--- a/src/status_im/contexts/chat/messages/content/reactions/events.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/reactions/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.reactions.events
+(ns status-im.contexts.chat.messenger.messages.content.reactions.events
   (:require [clojure.set :as set]
             [status-im.constants :as constants]
             [taoensso.timbre :as log]
diff --git a/src/status_im/contexts/chat/messages/content/reactions/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/reactions/view.cljs
similarity index 95%
rename from src/status_im/contexts/chat/messages/content/reactions/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/reactions/view.cljs
index 6af8a5979a7..7e61ec4f490 100644
--- a/src/status_im/contexts/chat/messages/content/reactions/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/reactions/view.cljs
@@ -1,9 +1,9 @@
-(ns status-im.contexts.chat.messages.content.reactions.view
+(ns status-im.contexts.chat.messenger.messages.content.reactions.view
   (:require
     [quo.core :as quo]
     [quo.theme :as quo.theme]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.drawers.view :as drawers]
+    [status-im.contexts.chat.messenger.messages.drawers.view :as drawers]
     [utils.re-frame :as rf]))
 
 (defn- on-press
diff --git a/src/status_im/contexts/chat/messages/content/status/style.cljs b/src/status_im/contexts/chat/messenger/messages/content/status/style.cljs
similarity index 79%
rename from src/status_im/contexts/chat/messages/content/status/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/status/style.cljs
index 7eb1bb1ead0..15a829b7e80 100644
--- a/src/status_im/contexts/chat/messages/content/status/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/status/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.status.style
+(ns status-im.contexts.chat.messenger.messages.content.status.style
   (:require
     [quo.foundations.colors :as colors]))
 
diff --git a/src/status_im/contexts/chat/messages/content/status/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/status/view.cljs
similarity index 80%
rename from src/status_im/contexts/chat/messages/content/status/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/status/view.cljs
index e219fbe93b9..4f2d4389b42 100644
--- a/src/status_im/contexts/chat/messages/content/status/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/status/view.cljs
@@ -1,9 +1,9 @@
-(ns status-im.contexts.chat.messages.content.status.view
+(ns status-im.contexts.chat.messenger.messages.content.status.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
-    [status-im.contexts.chat.messages.content.status.style :as style]
+    [status-im.contexts.chat.messenger.messages.content.status.style :as style]
     [utils.i18n :as i18n]))
 
 (defn status
diff --git a/src/status_im/contexts/chat/messages/content/style.cljs b/src/status_im/contexts/chat/messenger/messages/content/style.cljs
similarity index 92%
rename from src/status_im/contexts/chat/messages/content/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/style.cljs
index 124c4cae7b7..59701b052fe 100644
--- a/src/status_im/contexts/chat/messages/content/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.style
+(ns status-im.contexts.chat.messenger.messages.content.style
   (:require
     [quo.foundations.colors :as colors]))
 
diff --git a/src/status_im/contexts/chat/messages/content/system/text/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/system/text/view.cljs
similarity index 77%
rename from src/status_im/contexts/chat/messages/content/system/text/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/system/text/view.cljs
index 5a29879efe0..f12c3823b3a 100644
--- a/src/status_im/contexts/chat/messages/content/system/text/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/system/text/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.system.text.view
+(ns status-im.contexts.chat.messenger.messages.content.system.text.view
   (:require
     [legacy.status-im.ui.screens.chat.message.legacy-view :as old-message]
     [react-native.core :as rn]))
diff --git a/src/status_im/contexts/chat/messages/content/text/style.cljs b/src/status_im/contexts/chat/messenger/messages/content/text/style.cljs
similarity index 94%
rename from src/status_im/contexts/chat/messages/content/text/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/text/style.cljs
index 0a57af37705..c5afbe9c2c0 100644
--- a/src/status_im/contexts/chat/messages/content/text/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/text/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.text.style
+(ns status-im.contexts.chat.messenger.messages.content.text.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]))
diff --git a/src/status_im/contexts/chat/messages/content/text/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/text/view.cljs
similarity index 95%
rename from src/status_im/contexts/chat/messages/content/text/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/text/view.cljs
index 477affea4f3..e83366d8f3e 100644
--- a/src/status_im/contexts/chat/messages/content/text/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/text/view.cljs
@@ -1,11 +1,11 @@
-(ns status-im.contexts.chat.messages.content.text.view
+(ns status-im.contexts.chat.messenger.messages.content.text.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [react-native.platform :as platform]
-    [status-im.contexts.chat.messages.content.link-preview.view :as link-preview]
-    [status-im.contexts.chat.messages.content.text.style :as style]
+    [status-im.contexts.chat.messenger.messages.content.link-preview.view :as link-preview]
+    [status-im.contexts.chat.messenger.messages.content.text.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/messages/content/unknown/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/unknown/view.cljs
similarity index 76%
rename from src/status_im/contexts/chat/messages/content/unknown/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/unknown/view.cljs
index e54b7300a00..7e1b7ff3263 100644
--- a/src/status_im/contexts/chat/messages/content/unknown/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/unknown/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.unknown.view
+(ns status-im.contexts.chat.messenger.messages.content.unknown.view
   (:require
     [react-native.core :as rn]))
 
diff --git a/src/status_im/contexts/chat/messages/content/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/view.cljs
similarity index 90%
rename from src/status_im/contexts/chat/messages/content/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/content/view.cljs
index aadf109b616..450d7e9c816 100644
--- a/src/status_im/contexts/chat/messages/content/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.content.view
+(ns status-im.contexts.chat.messenger.messages.content.view
   (:require
     [legacy.status-im.ui.screens.chat.message.legacy-view :as old-message]
     [quo.core :as quo]
@@ -10,20 +10,20 @@
     [reagent.core :as reagent]
     [status-im.common.not-implemented :as not-implemented]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.composer.reply.view :as reply]
-    [status-im.contexts.chat.messages.avatar.view :as avatar]
-    [status-im.contexts.chat.messages.content.album.view :as album]
-    [status-im.contexts.chat.messages.content.audio.view :as audio]
-    [status-im.contexts.chat.messages.content.deleted.view :as content.deleted]
-    [status-im.contexts.chat.messages.content.image.view :as image]
-    [status-im.contexts.chat.messages.content.pin.view :as pin]
-    [status-im.contexts.chat.messages.content.reactions.view :as reactions]
-    [status-im.contexts.chat.messages.content.status.view :as status]
-    [status-im.contexts.chat.messages.content.style :as style]
-    [status-im.contexts.chat.messages.content.system.text.view :as system.text]
-    [status-im.contexts.chat.messages.content.text.view :as content.text]
-    [status-im.contexts.chat.messages.content.unknown.view :as content.unknown]
-    [status-im.contexts.chat.messages.drawers.view :as drawers]
+    [status-im.contexts.chat.messenger.composer.reply.view :as reply]
+    [status-im.contexts.chat.messenger.messages.avatar.view :as avatar]
+    [status-im.contexts.chat.messenger.messages.content.album.view :as album]
+    [status-im.contexts.chat.messenger.messages.content.audio.view :as audio]
+    [status-im.contexts.chat.messenger.messages.content.deleted.view :as content.deleted]
+    [status-im.contexts.chat.messenger.messages.content.image.view :as image]
+    [status-im.contexts.chat.messenger.messages.content.pin.view :as pin]
+    [status-im.contexts.chat.messenger.messages.content.reactions.view :as reactions]
+    [status-im.contexts.chat.messenger.messages.content.status.view :as status]
+    [status-im.contexts.chat.messenger.messages.content.style :as style]
+    [status-im.contexts.chat.messenger.messages.content.system.text.view :as system.text]
+    [status-im.contexts.chat.messenger.messages.content.text.view :as content.text]
+    [status-im.contexts.chat.messenger.messages.content.unknown.view :as content.unknown]
+    [status-im.contexts.chat.messenger.messages.drawers.view :as drawers]
     [utils.address :as address]
     [utils.datetime :as datetime]
     [utils.re-frame :as rf]))
diff --git a/src/status_im/contexts/chat/messages/delete_message/events.cljs b/src/status_im/contexts/chat/messenger/messages/delete_message/events.cljs
similarity index 98%
rename from src/status_im/contexts/chat/messages/delete_message/events.cljs
rename to src/status_im/contexts/chat/messenger/messages/delete_message/events.cljs
index 98914bc83a6..23a9e2a8373 100644
--- a/src/status_im/contexts/chat/messages/delete_message/events.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/delete_message/events.cljs
@@ -1,6 +1,6 @@
-(ns status-im.contexts.chat.messages.delete-message.events
+(ns status-im.contexts.chat.messenger.messages.delete-message.events
   (:require
-    [status-im.contexts.chat.messages.list.events :as message-list]
+    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
     [taoensso.timbre :as log]
     [utils.datetime :as datetime]
     [utils.i18n :as i18n]
diff --git a/src/status_im/contexts/chat/messages/delete_message/events_test.cljs b/src/status_im/contexts/chat/messenger/messages/delete_message/events_test.cljs
similarity index 97%
rename from src/status_im/contexts/chat/messages/delete_message/events_test.cljs
rename to src/status_im/contexts/chat/messenger/messages/delete_message/events_test.cljs
index 3254e746884..d11e9f7be25 100644
--- a/src/status_im/contexts/chat/messages/delete_message/events_test.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/delete_message/events_test.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.messages.delete-message.events-test
+(ns status-im.contexts.chat.messenger.messages.delete-message.events-test
   (:require
     [cljs.test :refer-macros [deftest is testing]]
-    [status-im.contexts.chat.messages.delete-message.events :as delete-message]
+    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
     [utils.datetime :as datetime]))
 
 (def mid "message-id")
diff --git a/src/status_im/contexts/chat/messages/delete_message_for_me/events.cljs b/src/status_im/contexts/chat/messenger/messages/delete_message_for_me/events.cljs
similarity index 97%
rename from src/status_im/contexts/chat/messages/delete_message_for_me/events.cljs
rename to src/status_im/contexts/chat/messenger/messages/delete_message_for_me/events.cljs
index baf559b5a88..05b8f1195a1 100644
--- a/src/status_im/contexts/chat/messages/delete_message_for_me/events.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/delete_message_for_me/events.cljs
@@ -1,6 +1,6 @@
-(ns status-im.contexts.chat.messages.delete-message-for-me.events
+(ns status-im.contexts.chat.messenger.messages.delete-message-for-me.events
   (:require
-    [status-im.contexts.chat.messages.list.events :as message-list]
+    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
     [taoensso.timbre :as log]
     [utils.datetime :as datetime]
     [utils.i18n :as i18n]
diff --git a/src/status_im/contexts/chat/messages/delete_message_for_me/events_test.cljs b/src/status_im/contexts/chat/messenger/messages/delete_message_for_me/events_test.cljs
similarity index 97%
rename from src/status_im/contexts/chat/messages/delete_message_for_me/events_test.cljs
rename to src/status_im/contexts/chat/messenger/messages/delete_message_for_me/events_test.cljs
index 6aea15f0381..712275cc44d 100644
--- a/src/status_im/contexts/chat/messages/delete_message_for_me/events_test.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/delete_message_for_me/events_test.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.messages.delete-message-for-me.events-test
+(ns status-im.contexts.chat.messenger.messages.delete-message-for-me.events-test
   (:require
     [cljs.test :refer-macros [deftest is testing]]
-    [status-im.contexts.chat.messages.delete-message-for-me.events :as
+    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events :as
      delete-message-for-me]
     [utils.datetime :as datetime]))
 
diff --git a/src/status_im/contexts/chat/messages/drawers/style.cljs b/src/status_im/contexts/chat/messenger/messages/drawers/style.cljs
similarity index 89%
rename from src/status_im/contexts/chat/messages/drawers/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/drawers/style.cljs
index dfb77dd4f3d..934e40b30c6 100644
--- a/src/status_im/contexts/chat/messages/drawers/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/drawers/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.drawers.style
+(ns status-im.contexts.chat.messenger.messages.drawers.style
   (:require
     [quo.foundations.colors :as colors]))
 
diff --git a/src/status_im/contexts/chat/messages/drawers/view.cljs b/src/status_im/contexts/chat/messenger/messages/drawers/view.cljs
similarity index 98%
rename from src/status_im/contexts/chat/messages/drawers/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/drawers/view.cljs
index 2e99b7f6af5..e269ecf0399 100644
--- a/src/status_im/contexts/chat/messages/drawers/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/drawers/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.drawers.view
+(ns status-im.contexts.chat.messenger.messages.drawers.view
   (:require
     [quo.components.selectors.reaction-resource :as reactions.resource]
     [quo.core :as quo]
@@ -8,8 +8,8 @@
     [reagent.core :as reagent]
     [status-im.common.contact-list-item.view :as contact-list-item]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.composer.reply.view :as reply]
-    [status-im.contexts.chat.messages.drawers.style :as style]
+    [status-im.contexts.chat.messenger.composer.reply.view :as reply]
+    [status-im.contexts.chat.messenger.messages.drawers.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/messages/link_preview/events.cljs b/src/status_im/contexts/chat/messenger/messages/link_preview/events.cljs
similarity index 99%
rename from src/status_im/contexts/chat/messages/link_preview/events.cljs
rename to src/status_im/contexts/chat/messenger/messages/link_preview/events.cljs
index c4a705bb30c..70a640fe4ed 100644
--- a/src/status_im/contexts/chat/messages/link_preview/events.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/link_preview/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.link-preview.events
+(ns status-im.contexts.chat.messenger.messages.link-preview.events
   (:require
     [camel-snake-kebab.core :as csk]
     [legacy.status-im.mailserver.core :as mailserver]
diff --git a/src/status_im/contexts/chat/messages/link_preview/events_test.cljs b/src/status_im/contexts/chat/messenger/messages/link_preview/events_test.cljs
similarity index 97%
rename from src/status_im/contexts/chat/messages/link_preview/events_test.cljs
rename to src/status_im/contexts/chat/messenger/messages/link_preview/events_test.cljs
index e4f0564c2fb..1c5fda33a97 100644
--- a/src/status_im/contexts/chat/messages/link_preview/events_test.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/link_preview/events_test.cljs
@@ -1,8 +1,8 @@
-(ns status-im.contexts.chat.messages.link-preview.events-test
+(ns status-im.contexts.chat.messenger.messages.link-preview.events-test
   (:require [cljs.test :as t]
             [legacy.status-im.mailserver.core :as mailserver]
             matcher-combinators.test
-            [status-im.contexts.chat.messages.link-preview.events :as sut]))
+            [status-im.contexts.chat.messenger.messages.link-preview.events :as sut]))
 
 (t/deftest fetch-community
   (t/testing "with community id"
diff --git a/src/status_im/contexts/chat/messages/link_preview/style.cljs b/src/status_im/contexts/chat/messenger/messages/link_preview/style.cljs
similarity index 96%
rename from src/status_im/contexts/chat/messages/link_preview/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/link_preview/style.cljs
index 1b9aaafe414..614058777fa 100644
--- a/src/status_im/contexts/chat/messages/link_preview/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/link_preview/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.link-preview.style
+(ns status-im.contexts.chat.messenger.messages.link-preview.style
   (:require
     [quo.foundations.colors :as colors]
     [quo.foundations.typography :as typography]
diff --git a/src/status_im/contexts/chat/messages/link_preview/view.cljs b/src/status_im/contexts/chat/messenger/messages/link_preview/view.cljs
similarity index 96%
rename from src/status_im/contexts/chat/messages/link_preview/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/link_preview/view.cljs
index 90d615b1e11..5bf5fe9921f 100644
--- a/src/status_im/contexts/chat/messages/link_preview/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/link_preview/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.link-preview.view
+(ns status-im.contexts.chat.messenger.messages.link-preview.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
@@ -6,8 +6,8 @@
     [react-native.fast-image :as fast-image]
     [reagent.core :as reagent]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.link-preview.events]
-    [status-im.contexts.chat.messages.link-preview.style :as style]
+    [status-im.contexts.chat.messenger.messages.link-preview.events]
+    [status-im.contexts.chat.messenger.messages.link-preview.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [utils.security.core :as security]))
diff --git a/src/status_im/contexts/chat/messages/list/events.cljs b/src/status_im/contexts/chat/messenger/messages/list/events.cljs
similarity index 99%
rename from src/status_im/contexts/chat/messages/list/events.cljs
rename to src/status_im/contexts/chat/messenger/messages/list/events.cljs
index b9c9fa50712..7b741b013e5 100644
--- a/src/status_im/contexts/chat/messages/list/events.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/list/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.list.events
+(ns status-im.contexts.chat.messenger.messages.list.events
   (:require
     [status-im.constants :as constants]
     [utils.datetime :as datetime]
diff --git a/src/status_im/contexts/chat/messages/list/events_test.cljs b/src/status_im/contexts/chat/messenger/messages/list/events_test.cljs
similarity index 98%
rename from src/status_im/contexts/chat/messages/list/events_test.cljs
rename to src/status_im/contexts/chat/messenger/messages/list/events_test.cljs
index bed155efbfb..f1d12513df0 100644
--- a/src/status_im/contexts/chat/messages/list/events_test.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/list/events_test.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.messages.list.events-test
+(ns status-im.contexts.chat.messenger.messages.list.events-test
   (:require
     [cljs.test :refer-macros [deftest is testing]]
-    [status-im.contexts.chat.messages.list.events :as s]
+    [status-im.contexts.chat.messenger.messages.list.events :as s]
     [taoensso.tufte :as tufte :refer-macros [defnp profile]]))
 
 (deftest message-stream-tests
diff --git a/src/status_im/contexts/chat/messages/list/state.cljs b/src/status_im/contexts/chat/messenger/messages/list/state.cljs
similarity index 81%
rename from src/status_im/contexts/chat/messages/list/state.cljs
rename to src/status_im/contexts/chat/messenger/messages/list/state.cljs
index 9ecc88735a4..d06974e912a 100644
--- a/src/status_im/contexts/chat/messages/list/state.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/list/state.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.list.state)
+(ns status-im.contexts.chat.messenger.messages.list.state)
 
 (defonce first-not-visible-item (atom nil))
 
diff --git a/src/status_im/contexts/chat/messages/list/style.cljs b/src/status_im/contexts/chat/messenger/messages/list/style.cljs
similarity index 89%
rename from src/status_im/contexts/chat/messages/list/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/list/style.cljs
index 9e34ca2eff2..482704e0253 100644
--- a/src/status_im/contexts/chat/messages/list/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/list/style.cljs
@@ -1,8 +1,8 @@
-(ns status-im.contexts.chat.messages.list.style
+(ns status-im.contexts.chat.messenger.messages.list.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.messages.constants :as messages.constants]))
+    [status-im.contexts.chat.messenger.messages.constants :as messages.constants]))
 
 (def keyboard-avoiding-container
   {:flex    1
diff --git a/src/status_im/contexts/chat/messages/list/view.cljs b/src/status_im/contexts/chat/messenger/messages/list/view.cljs
similarity index 97%
rename from src/status_im/contexts/chat/messages/list/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/list/view.cljs
index 3389a63b797..656b05ebc5b 100644
--- a/src/status_im/contexts/chat/messages/list/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/list/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.list.view
+(ns status-im.contexts.chat.messenger.messages.list.view
   (:require
     [legacy.status-im.ui.screens.chat.group :as chat.group]
     [oops.core :as oops]
@@ -13,11 +13,11 @@
     [react-native.safe-area :as safe-area]
     [status-im.common.home.actions.view :as home.actions]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.composer.constants :as composer.constants]
-    [status-im.contexts.chat.messages.constants :as messages.constants]
-    [status-im.contexts.chat.messages.content.view :as message]
-    [status-im.contexts.chat.messages.list.state :as state]
-    [status-im.contexts.chat.messages.list.style :as style]
+    [status-im.contexts.chat.messenger.composer.constants :as composer.constants]
+    [status-im.contexts.chat.messenger.messages.constants :as messages.constants]
+    [status-im.contexts.chat.messenger.messages.content.view :as message]
+    [status-im.contexts.chat.messenger.messages.list.state :as state]
+    [status-im.contexts.chat.messenger.messages.list.style :as style]
     [status-im.contexts.shell.jump-to.constants :as jump-to.constants]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
diff --git a/src/status_im/contexts/chat/messages/navigation/style.cljs b/src/status_im/contexts/chat/messenger/messages/navigation/style.cljs
similarity index 95%
rename from src/status_im/contexts/chat/messages/navigation/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/navigation/style.cljs
index c07f6c94ec3..682f8210619 100644
--- a/src/status_im/contexts/chat/messages/navigation/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/navigation/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.navigation.style
+(ns status-im.contexts.chat.messenger.messages.navigation.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.reanimated :as reanimated]))
diff --git a/src/status_im/contexts/chat/messages/navigation/view.cljs b/src/status_im/contexts/chat/messenger/messages/navigation/view.cljs
similarity index 95%
rename from src/status_im/contexts/chat/messages/navigation/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/navigation/view.cljs
index d858d38e1be..5318a07d20c 100644
--- a/src/status_im/contexts/chat/messages/navigation/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/navigation/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.navigation.view
+(ns status-im.contexts.chat.messenger.messages.navigation.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
@@ -10,9 +10,9 @@
     [react-native.safe-area :as safe-area]
     [status-im.common.home.actions.view :as actions]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.constants :as messages.constants]
-    [status-im.contexts.chat.messages.navigation.style :as style]
-    [status-im.contexts.chat.messages.pin.banner.view :as pin.banner]
+    [status-im.contexts.chat.messenger.messages.constants :as messages.constants]
+    [status-im.contexts.chat.messenger.messages.navigation.style :as style]
+    [status-im.contexts.chat.messenger.messages.pin.banner.view :as pin.banner]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [utils.worklets.chat.messages :as worklets]))
diff --git a/src/status_im/contexts/chat/messages/pin/banner/style.cljs b/src/status_im/contexts/chat/messenger/messages/pin/banner/style.cljs
similarity index 71%
rename from src/status_im/contexts/chat/messages/pin/banner/style.cljs
rename to src/status_im/contexts/chat/messenger/messages/pin/banner/style.cljs
index a1b6385a0ec..259d89851ea 100644
--- a/src/status_im/contexts/chat/messages/pin/banner/style.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/pin/banner/style.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.messages.pin.banner.style
+(ns status-im.contexts.chat.messenger.messages.pin.banner.style
   (:require
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.messages.constants :as messages.constants]))
+    [status-im.contexts.chat.messenger.messages.constants :as messages.constants]))
 
 (def container
   {:position :absolute
diff --git a/src/status_im/contexts/chat/messages/pin/banner/view.cljs b/src/status_im/contexts/chat/messenger/messages/pin/banner/view.cljs
similarity index 88%
rename from src/status_im/contexts/chat/messages/pin/banner/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/pin/banner/view.cljs
index bc3493ca98b..9d664c45057 100644
--- a/src/status_im/contexts/chat/messages/pin/banner/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/pin/banner/view.cljs
@@ -1,11 +1,11 @@
-(ns status-im.contexts.chat.messages.pin.banner.view
+(ns status-im.contexts.chat.messenger.messages.pin.banner.view
   (:require
     [quo.core :as quo]
     [quo.theme :as theme]
     [react-native.blur :as blur]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.messages.pin.banner.style :as style]
+    [status-im.contexts.chat.messenger.messages.pin.banner.style :as style]
     [utils.re-frame :as rf]))
 
 (defn f-banner
diff --git a/src/status_im/contexts/chat/messages/pin/events.cljs b/src/status_im/contexts/chat/messenger/messages/pin/events.cljs
similarity index 96%
rename from src/status_im/contexts/chat/messages/pin/events.cljs
rename to src/status_im/contexts/chat/messenger/messages/pin/events.cljs
index fbed1f08578..9f03b947ef8 100644
--- a/src/status_im/contexts/chat/messages/pin/events.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/pin/events.cljs
@@ -1,12 +1,12 @@
-(ns status-im.contexts.chat.messages.pin.events
+(ns status-im.contexts.chat.messenger.messages.pin.events
   (:require
     [legacy.status-im.data-store.messages :as data-store.messages]
     [legacy.status-im.data-store.pin-messages :as data-store.pin-messages]
     [re-frame.core :as re-frame]
     [status-im.common.toasts.events :as toasts]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.menus.pinned-messages.view :as pinned-messages-menu]
-    [status-im.contexts.chat.messages.list.events :as message-list]
+    [status-im.contexts.chat.messenger.menus.pinned-messages.view :as pinned-messages-menu]
+    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
diff --git a/src/status_im/contexts/chat/messages/pin/events_test.cljs b/src/status_im/contexts/chat/messenger/messages/pin/events_test.cljs
similarity index 93%
rename from src/status_im/contexts/chat/messages/pin/events_test.cljs
rename to src/status_im/contexts/chat/messenger/messages/pin/events_test.cljs
index a147bd6b2af..bfa942b97e4 100644
--- a/src/status_im/contexts/chat/messages/pin/events_test.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/pin/events_test.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.messages.pin.events-test
+(ns status-im.contexts.chat.messenger.messages.pin.events-test
   (:require
     [cljs.test :refer-macros [deftest is testing]]
-    [status-im.contexts.chat.messages.pin.events :as events]))
+    [status-im.contexts.chat.messenger.messages.pin.events :as events]))
 
 (deftest receive-signal-test
   (let [chat-id      "chat-id"
diff --git a/src/status_im/contexts/chat/messages/resolver/message_resolver.cljs b/src/status_im/contexts/chat/messenger/messages/resolver/message_resolver.cljs
similarity index 87%
rename from src/status_im/contexts/chat/messages/resolver/message_resolver.cljs
rename to src/status_im/contexts/chat/messenger/messages/resolver/message_resolver.cljs
index 03d9fe2a7b3..c626816978a 100644
--- a/src/status_im/contexts/chat/messages/resolver/message_resolver.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/resolver/message_resolver.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.resolver.message-resolver
+(ns status-im.contexts.chat.messenger.messages.resolver.message-resolver
   (:require
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/messages/resolver/message_resolver_test.cljs b/src/status_im/contexts/chat/messenger/messages/resolver/message_resolver_test.cljs
similarity index 82%
rename from src/status_im/contexts/chat/messages/resolver/message_resolver_test.cljs
rename to src/status_im/contexts/chat/messenger/messages/resolver/message_resolver_test.cljs
index 85663eea4f0..766f5997b29 100644
--- a/src/status_im/contexts/chat/messages/resolver/message_resolver_test.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/resolver/message_resolver_test.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.messages.resolver.message-resolver-test
+(ns status-im.contexts.chat.messenger.messages.resolver.message-resolver-test
   (:require
     [cljs.test :as t]
-    [status-im.contexts.chat.messages.resolver.message-resolver :as resolver]
+    [status-im.contexts.chat.messenger.messages.resolver.message-resolver :as resolver]
     [utils.re-frame :as rf]))
 
 (def mentions
diff --git a/src/status_im/contexts/chat/messages/transport/events.cljs b/src/status_im/contexts/chat/messenger/messages/transport/events.cljs
similarity index 98%
rename from src/status_im/contexts/chat/messages/transport/events.cljs
rename to src/status_im/contexts/chat/messenger/messages/transport/events.cljs
index 679f837797a..6e785375bcf 100644
--- a/src/status_im/contexts/chat/messages/transport/events.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/transport/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.messages.transport.events
+(ns status-im.contexts.chat.messenger.messages.transport.events
   (:require
     [clojure.set :as set]
     [clojure.string :as string]
@@ -16,8 +16,8 @@
     [status-im.constants :as constants]
     [status-im.contexts.chat.contacts.events :as models.contact]
     [status-im.contexts.chat.events :as chat.events]
-    [status-im.contexts.chat.messages.content.reactions.events :as reactions]
-    [status-im.contexts.chat.messages.pin.events :as messages.pin]
+    [status-im.contexts.chat.messenger.messages.content.reactions.events :as reactions]
+    [status-im.contexts.chat.messenger.messages.pin.events :as messages.pin]
     [status-im.contexts.communities.events :as communities]
     [status-im.contexts.shell.activity-center.events :as activity-center]
     [taoensso.timbre :as log]
diff --git a/src/status_im/contexts/chat/messages/view.cljs b/src/status_im/contexts/chat/messenger/messages/view.cljs
similarity index 85%
rename from src/status_im/contexts/chat/messages/view.cljs
rename to src/status_im/contexts/chat/messenger/messages/view.cljs
index 44b6bba7a40..75979b5d64f 100644
--- a/src/status_im/contexts/chat/messages/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/view.cljs
@@ -1,14 +1,14 @@
-(ns status-im.contexts.chat.messages.view
+(ns status-im.contexts.chat.messenger.messages.view
   (:require
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
-    [status-im.contexts.chat.composer.view :as composer.view]
-    [status-im.contexts.chat.messages.list.style :as style]
-    [status-im.contexts.chat.messages.list.view :as list.view]
-    [status-im.contexts.chat.messages.navigation.view :as messages.navigation]
-    [status-im.contexts.chat.placeholder.view :as placeholder.view]
+    [status-im.contexts.chat.messenger.composer.view :as composer.view]
+    [status-im.contexts.chat.messenger.messages.list.style :as style]
+    [status-im.contexts.chat.messenger.messages.list.view :as list.view]
+    [status-im.contexts.chat.messenger.messages.navigation.view :as messages.navigation]
+    [status-im.contexts.chat.messenger.placeholder.view :as placeholder.view]
     [utils.re-frame :as rf]))
 
 ;; NOTE(parvesh) - I am working on refactoring/optimization of the chat screen for performance
diff --git a/src/status_im/contexts/chat/photo_selector/album_selector/style.cljs b/src/status_im/contexts/chat/messenger/photo_selector/album_selector/style.cljs
similarity index 93%
rename from src/status_im/contexts/chat/photo_selector/album_selector/style.cljs
rename to src/status_im/contexts/chat/messenger/photo_selector/album_selector/style.cljs
index d48704baf60..2ca1952bad7 100644
--- a/src/status_im/contexts/chat/photo_selector/album_selector/style.cljs
+++ b/src/status_im/contexts/chat/messenger/photo_selector/album_selector/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.photo-selector.album-selector.style
+(ns status-im.contexts.chat.messenger.photo-selector.album-selector.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.reanimated :as reanimated]))
diff --git a/src/status_im/contexts/chat/photo_selector/album_selector/view.cljs b/src/status_im/contexts/chat/messenger/photo_selector/album_selector/view.cljs
similarity index 96%
rename from src/status_im/contexts/chat/photo_selector/album_selector/view.cljs
rename to src/status_im/contexts/chat/messenger/photo_selector/album_selector/view.cljs
index 319d5f8bc4d..867e914d0a2 100644
--- a/src/status_im/contexts/chat/photo_selector/album_selector/view.cljs
+++ b/src/status_im/contexts/chat/messenger/photo_selector/album_selector/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.photo-selector.album-selector.view
+(ns status-im.contexts.chat.messenger.photo-selector.album-selector.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
@@ -6,7 +6,7 @@
     [react-native.gesture :as gesture]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.photo-selector.album-selector.style :as style]
+    [status-im.contexts.chat.messenger.photo-selector.album-selector.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/photo_selector/effects.cljs b/src/status_im/contexts/chat/messenger/photo_selector/effects.cljs
similarity index 98%
rename from src/status_im/contexts/chat/photo_selector/effects.cljs
rename to src/status_im/contexts/chat/messenger/photo_selector/effects.cljs
index 6a2c0effafe..35e4032a769 100644
--- a/src/status_im/contexts/chat/photo_selector/effects.cljs
+++ b/src/status_im/contexts/chat/messenger/photo_selector/effects.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.photo-selector.effects
+(ns status-im.contexts.chat.messenger.photo-selector.effects
   (:require
     [clojure.string :as string]
     [react-native.cameraroll :as cameraroll]
diff --git a/src/status_im/contexts/chat/photo_selector/events.cljs b/src/status_im/contexts/chat/messenger/photo_selector/events.cljs
similarity index 95%
rename from src/status_im/contexts/chat/photo_selector/events.cljs
rename to src/status_im/contexts/chat/messenger/photo_selector/events.cljs
index a2382c545c0..27f287f3293 100644
--- a/src/status_im/contexts/chat/photo_selector/events.cljs
+++ b/src/status_im/contexts/chat/messenger/photo_selector/events.cljs
@@ -1,7 +1,7 @@
-(ns status-im.contexts.chat.photo-selector.events
+(ns status-im.contexts.chat.messenger.photo-selector.events
   (:require
     [status-im.constants :as constants]
-    status-im.contexts.chat.photo-selector.effects
+    status-im.contexts.chat.messenger.photo-selector.effects
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
diff --git a/src/status_im/contexts/chat/photo_selector/style.cljs b/src/status_im/contexts/chat/messenger/photo_selector/style.cljs
similarity index 97%
rename from src/status_im/contexts/chat/photo_selector/style.cljs
rename to src/status_im/contexts/chat/messenger/photo_selector/style.cljs
index c126023bc6e..8387eb13c46 100644
--- a/src/status_im/contexts/chat/photo_selector/style.cljs
+++ b/src/status_im/contexts/chat/messenger/photo_selector/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.photo-selector.style
+(ns status-im.contexts.chat.messenger.photo-selector.style
   (:require
     [quo.foundations.colors :as colors]
     [react-native.platform :as platform]))
diff --git a/src/status_im/contexts/chat/photo_selector/view.cljs b/src/status_im/contexts/chat/messenger/photo_selector/view.cljs
similarity index 96%
rename from src/status_im/contexts/chat/photo_selector/view.cljs
rename to src/status_im/contexts/chat/messenger/photo_selector/view.cljs
index 7f5328418e5..a55451219cb 100644
--- a/src/status_im/contexts/chat/photo_selector/view.cljs
+++ b/src/status_im/contexts/chat/messenger/photo_selector/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.photo-selector.view
+(ns status-im.contexts.chat.messenger.photo-selector.view
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
@@ -9,8 +9,8 @@
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.photo-selector.album-selector.view :as album-selector]
-    [status-im.contexts.chat.photo-selector.style :as style]
+    [status-im.contexts.chat.messenger.photo-selector.album-selector.view :as album-selector]
+    [status-im.contexts.chat.messenger.photo-selector.style :as style]
     utils.collection
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
diff --git a/src/status_im/contexts/chat/placeholder/style.cljs b/src/status_im/contexts/chat/messenger/placeholder/style.cljs
similarity index 89%
rename from src/status_im/contexts/chat/placeholder/style.cljs
rename to src/status_im/contexts/chat/messenger/placeholder/style.cljs
index a0e853ecb93..a6309f17cb0 100644
--- a/src/status_im/contexts/chat/placeholder/style.cljs
+++ b/src/status_im/contexts/chat/messenger/placeholder/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.placeholder.style
+(ns status-im.contexts.chat.messenger.placeholder.style
   (:require [quo.foundations.colors :as colors]
             [react-native.reanimated :as reanimated]))
 
diff --git a/src/status_im/contexts/chat/placeholder/view.cljs b/src/status_im/contexts/chat/messenger/placeholder/view.cljs
similarity index 84%
rename from src/status_im/contexts/chat/placeholder/view.cljs
rename to src/status_im/contexts/chat/messenger/placeholder/view.cljs
index 6b97073e62e..48ea4a38c68 100644
--- a/src/status_im/contexts/chat/placeholder/view.cljs
+++ b/src/status_im/contexts/chat/messenger/placeholder/view.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.chat.placeholder.view
+(ns status-im.contexts.chat.messenger.placeholder.view
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
     [react-native.safe-area :as safe-area]
-    [status-im.contexts.chat.placeholder.style :as style]
+    [status-im.contexts.chat.messenger.placeholder.style :as style]
     [utils.worklets.chat.messages :as worklets]))
 
 (defn- loading-skeleton
diff --git a/src/status_im/contexts/profile/login/events.cljs b/src/status_im/contexts/profile/login/events.cljs
index 2100eb29c16..2917a27aaac 100644
--- a/src/status_im/contexts/profile/login/events.cljs
+++ b/src/status_im/contexts/profile/login/events.cljs
@@ -18,7 +18,7 @@
     [status-im.config :as config]
     [status-im.constants :as constants]
     [status-im.contexts.chat.contacts.events :as contacts]
-    [status-im.contexts.chat.messages.link-preview.events :as link-preview]
+    [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview]
     [status-im.contexts.profile.config :as profile.config]
     status-im.contexts.profile.login.effects
     [status-im.contexts.profile.push-notifications.events :as notifications]
diff --git a/src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs b/src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs
index c597e015ca6..d2ab8e402f3 100644
--- a/src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs
+++ b/src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs
@@ -3,7 +3,7 @@
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
-    [status-im.contexts.chat.messages.view :as chat]
+    [status-im.contexts.chat.messenger.messages.view :as chat]
     [status-im.contexts.communities.discover.view :as communities.discover]
     [status-im.contexts.communities.overview.view :as communities.overview]
     [status-im.contexts.shell.jump-to.animation :as animation]
diff --git a/src/status_im/contexts/shell/jump_to/components/switcher_cards/view.cljs b/src/status_im/contexts/shell/jump_to/components/switcher_cards/view.cljs
index 1ac4d88a39f..9dbb89a32bf 100644
--- a/src/status_im/contexts/shell/jump_to/components/switcher_cards/view.cljs
+++ b/src/status_im/contexts/shell/jump_to/components/switcher_cards/view.cljs
@@ -6,7 +6,7 @@
     [react-native.core :as rn]
     [react-native.fast-image :as fast-image]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.resolver.message-resolver :as resolver]
+    [status-im.contexts.chat.messenger.messages.resolver.message-resolver :as resolver]
     [status-im.contexts.shell.jump-to.animation :as animation]
     [status-im.contexts.shell.jump-to.components.switcher-cards.style :as style]
     [status-im.contexts.shell.jump-to.constants :as shell.constants]
diff --git a/src/status_im/core_spec.cljs b/src/status_im/core_spec.cljs
index e9431afab67..cda0e3d1e30 100644
--- a/src/status_im/core_spec.cljs
+++ b/src/status_im/core_spec.cljs
@@ -1,7 +1,7 @@
 (ns status-im.core-spec
   (:require
     [status-im.common.floating-button-page.component-spec]
-    [status-im.contexts.chat.messages.content.audio.component-spec]
+    [status-im.contexts.chat.messenger.messages.content.audio.component-spec]
     [status-im.contexts.communities.actions.community-options.component-spec]
     [status-im.contexts.wallet.add-address-to-watch.component-spec]
     [status-im.contexts.wallet.add-address-to-watch.confirm-address.component-spec]
diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs
index 701a334f6bc..b7d48274f0a 100644
--- a/src/status_im/events.cljs
+++ b/src/status_im/events.cljs
@@ -11,10 +11,10 @@
     status-im.common.signals.events
     status-im.common.theme.events
     [status-im.common.toasts.events]
-    status-im.contexts.chat.composer.events
     status-im.contexts.chat.events
     [status-im.contexts.chat.home.add-new-contact.events]
-    status-im.contexts.chat.photo-selector.events
+    status-im.contexts.chat.messenger.composer.events
+    status-im.contexts.chat.messenger.photo-selector.events
     status-im.contexts.communities.events
     status-im.contexts.communities.overview.events
     status-im.contexts.onboarding.common.overlay.events
diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs
index c80c9ec81d5..fd7b7cfd767 100644
--- a/src/status_im/navigation/screens.cljs
+++ b/src/status_im/navigation/screens.cljs
@@ -3,14 +3,14 @@
     [legacy.status-im.ui.screens.screens :as old-screens]
     [status-im.common.emoji-picker.view :as emoji-picker]
     [status-im.config :as config]
-    [status-im.contexts.chat.camera.view :as camera-screen]
     [status-im.contexts.chat.group-details.view :as group-details]
     [status-im.contexts.chat.home.add-new-contact.scan.scan-profile-qr-page :as scan-profile-qr-page]
     [status-im.contexts.chat.home.add-new-contact.views :as add-new-contact]
-    [status-im.contexts.chat.lightbox.view :as lightbox]
-    [status-im.contexts.chat.messages.view :as chat]
-    [status-im.contexts.chat.new-chat.view :as new-chat]
-    [status-im.contexts.chat.photo-selector.view :as photo-selector]
+    [status-im.contexts.chat.home.new-chat.view :as new-chat]
+    [status-im.contexts.chat.messenger.camera.view :as camera-screen]
+    [status-im.contexts.chat.messenger.lightbox.view :as lightbox]
+    [status-im.contexts.chat.messenger.messages.view :as chat]
+    [status-im.contexts.chat.messenger.photo-selector.view :as photo-selector]
     [status-im.contexts.communities.actions.accounts-selection.view :as communities.accounts-selection]
     [status-im.contexts.communities.actions.addresses-for-permissions.view :as
      addresses-for-permissions]
diff --git a/src/status_im/subs/chats.cljs b/src/status_im/subs/chats.cljs
index 9aa4493a344..b40d6e77e5f 100644
--- a/src/status_im/subs/chats.cljs
+++ b/src/status_im/subs/chats.cljs
@@ -5,8 +5,8 @@
     [legacy.status-im.group-chats.db :as group-chats.db]
     [re-frame.core :as re-frame]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.composer.constants :as composer.constants]
     [status-im.contexts.chat.events :as chat.events]
+    [status-im.contexts.chat.messenger.composer.constants :as composer.constants]
     [status-im.contexts.profile.utils :as profile.utils]))
 
 (def memo-chats-stack-items (atom nil))
diff --git a/src/status_im/subs/messages.cljs b/src/status_im/subs/messages.cljs
index 52d4df028f8..264dce844f6 100644
--- a/src/status_im/subs/messages.cljs
+++ b/src/status_im/subs/messages.cljs
@@ -2,8 +2,8 @@
   (:require
     [re-frame.core :as re-frame]
     [status-im.constants :as constants]
-    [status-im.contexts.chat.messages.list.events :as models.message-list]
-    [status-im.contexts.chat.messages.resolver.message-resolver :as resolver]
+    [status-im.contexts.chat.messenger.messages.list.events :as models.message-list]
+    [status-im.contexts.chat.messenger.messages.resolver.message-resolver :as resolver]
     [utils.i18n :as i18n]))
 
 (defn intersperse-datemark