diff --git a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt
index e85919a45f..2389fbd724 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt
@@ -18,7 +18,7 @@ package im.vector.app.features.analytics
 
 import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
-import im.vector.app.features.analytics.plan.Identity
+import im.vector.app.features.analytics.plan.UserProperties
 
 interface AnalyticsTracker {
     /**
@@ -34,5 +34,5 @@ interface AnalyticsTracker {
     /**
      * Update user specific properties
      */
-    fun updateUserProperties(identity: Identity)
+    fun updateUserProperties(userProperties: UserProperties)
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
index ff23fd9a64..c13f8295f2 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.analytics.extensions
 import im.vector.app.features.analytics.plan.JoinedRoom
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 
 fun Int?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
@@ -35,6 +36,7 @@ fun Int?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
 fun RoomSummary?.toAnalyticsJoinedRoom(): JoinedRoom {
     return JoinedRoom(
             isDM = this?.isDirect.orFalse(),
+            isSpace = this?.roomType == RoomType.SPACE,
             roomSize = this?.joinedMembersCount?.toAnalyticsRoomSize() ?: JoinedRoom.RoomSize.Two
     )
 }
@@ -42,6 +44,7 @@ fun RoomSummary?.toAnalyticsJoinedRoom(): JoinedRoom {
 fun PublicRoom.toAnalyticsJoinedRoom(): JoinedRoom {
     return JoinedRoom(
             isDM = false,
+            isSpace = false,
             roomSize = numJoinedMembers.toAnalyticsRoomSize()
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/IdentityExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
similarity index 60%
rename from vector/src/main/java/im/vector/app/features/analytics/extensions/IdentityExt.kt
rename to vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
index d87769fd36..7fad43783b 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/extensions/IdentityExt.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.kt
@@ -16,14 +16,14 @@
 
 package im.vector.app.features.analytics.extensions
 
-import im.vector.app.features.analytics.plan.Identity
+import im.vector.app.features.analytics.plan.UserProperties
 import im.vector.app.features.onboarding.FtueUseCase
 
-fun FtueUseCase.toTrackingValue(): Identity.FtueUseCaseSelection {
+fun FtueUseCase.toTrackingValue(): UserProperties.FtueUseCaseSelection {
     return when (this) {
-        FtueUseCase.FRIENDS_FAMILY -> Identity.FtueUseCaseSelection.PersonalMessaging
-        FtueUseCase.TEAMS          -> Identity.FtueUseCaseSelection.WorkMessaging
-        FtueUseCase.COMMUNITIES    -> Identity.FtueUseCaseSelection.CommunityMessaging
-        FtueUseCase.SKIP           -> Identity.FtueUseCaseSelection.Skip
+        FtueUseCase.FRIENDS_FAMILY -> UserProperties.FtueUseCaseSelection.PersonalMessaging
+        FtueUseCase.TEAMS          -> UserProperties.FtueUseCaseSelection.WorkMessaging
+        FtueUseCase.COMMUNITIES    -> UserProperties.FtueUseCaseSelection.CommunityMessaging
+        FtueUseCase.SKIP           -> UserProperties.FtueUseCaseSelection.Skip
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
index 62d360f5f7..83e21ced03 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
@@ -26,7 +26,7 @@ import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.log.analyticsTag
-import im.vector.app.features.analytics.plan.Identity
+import im.vector.app.features.analytics.plan.UserProperties
 import im.vector.app.features.analytics.store.AnalyticsStore
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.Flow
@@ -175,8 +175,8 @@ class DefaultVectorAnalytics @Inject constructor(
                 ?.screen(screen.getName(), screen.getProperties()?.toPostHogProperties())
     }
 
-    override fun updateUserProperties(identity: Identity) {
-        posthog?.identify(REUSE_EXISTING_ID, identity.getProperties().toPostHogProperties(), IGNORED_OPTIONS)
+    override fun updateUserProperties(userProperties: UserProperties) {
+        posthog?.identify(REUSE_EXISTING_ID, userProperties.getProperties().toPostHogProperties(), IGNORED_OPTIONS)
     }
 
     private fun Map<String, Any?>?.toPostHogProperties(): Properties? {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index 2da69bbe6c..c757fd02ba 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -119,7 +119,7 @@ import im.vector.app.core.utils.startInstallFromSourceIntent
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.DialogReportContentBinding
 import im.vector.app.databinding.FragmentTimelineBinding
-import im.vector.app.features.analytics.plan.Click
+import im.vector.app.features.analytics.plan.Composer
 import im.vector.app.features.analytics.plan.Screen
 import im.vector.app.features.attachments.AttachmentTypeSelectorView
 import im.vector.app.features.attachments.AttachmentsHelper
@@ -1499,7 +1499,9 @@ class TimelineFragment @Inject constructor(
             return
         }
         if (text.isNotBlank()) {
-            analyticsTracker.capture(Click(name = Click.Name.SendMessageButton))
+            withState(messageComposerViewModel) { state ->
+                analyticsTracker.capture(Composer(isThreadTimeLine(), isEditing = state.sendMode is SendMode.Edit, isReply = state.sendMode is SendMode.Reply))
+            }
             // We collapse ASAP, if not there will be a slight annoying delay
             views.composerLayout.collapse(true)
             lockSendButton = true
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 8097e90206..0d05a38dfa 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -39,7 +39,7 @@ import im.vector.app.core.utils.ensureTrailingSlash
 import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.extensions.toTrackingValue
-import im.vector.app.features.analytics.plan.Identity
+import im.vector.app.features.analytics.plan.UserProperties
 import im.vector.app.features.login.HomeServerConnectionConfigFactory
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.login.LoginMode
@@ -465,13 +465,13 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun handleUpdateUseCase(action: OnboardingAction.UpdateUseCase) {
         setState { copy(useCase = action.useCase) }
-        analyticsTracker.updateUserProperties(Identity(ftueUseCaseSelection = action.useCase.toTrackingValue()))
+        analyticsTracker.updateUserProperties(UserProperties(ftueUseCaseSelection = action.useCase.toTrackingValue()))
         _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
     }
 
     private fun resetUseCase() {
         setState { copy(useCase = null) }
-        analyticsTracker.updateUserProperties(Identity(ftueUseCaseSelection = null))
+        analyticsTracker.updateUserProperties(UserProperties(ftueUseCaseSelection = null))
     }
 
     private fun handleUpdateServerType(action: OnboardingAction.UpdateServerType) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
index b1fa0e974a..42bec8c8b3 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
@@ -251,6 +251,7 @@ class RoomPreviewViewModel @AssistedInject constructor(
                 analyticsTracker.capture(JoinedRoom(
                         // Always false in this case (?)
                         isDM = false,
+                        isSpace = false,
                         roomSize = state.numJoinMembers.toAnalyticsRoomSize()
                 ))
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.