diff --git a/app/src/main/java/com/geeksville/mesh/ui/Channel.kt b/app/src/main/java/com/geeksville/mesh/ui/Channel.kt
index 81eac742..88a32584 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Channel.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Channel.kt
@@ -17,6 +17,7 @@ import androidx.ui.material.OutlinedButton
 import androidx.ui.material.ripple.Ripple
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.dp
+import com.geeksville.analytics.DataPair
 import com.geeksville.android.GeeksvilleApplication
 import com.geeksville.android.Logging
 import com.geeksville.mesh.R
@@ -94,7 +95,10 @@ fun ChannelContent(channel: Channel = Channel("Default", 7)) {
             Ripple(bounded = false) {
                 OutlinedButton(modifier = LayoutGravity.Center + LayoutPadding(left = 24.dp),
                     onClick = {
-                        GeeksvilleApplication.analytics.track("channel_share") // track how many times users share channels
+                        GeeksvilleApplication.analytics.track(
+                            "share",
+                            DataPair("content_type", "channel")
+                        ) // track how many times users share channels
 
                         val sendIntent: Intent = Intent().apply {
                             action = Intent.ACTION_SEND
diff --git a/app/src/main/java/com/geeksville/mesh/ui/Messages.kt b/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
index 37504595..cb07b731 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
@@ -17,6 +17,7 @@ import androidx.ui.material.ProvideEmphasis
 import androidx.ui.text.TextStyle
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.dp
+import com.geeksville.android.GeeksvilleApplication
 import com.geeksville.mesh.model.MessagesState
 import com.geeksville.mesh.model.MessagesState.messages
 import com.geeksville.mesh.model.NodeDB
@@ -105,6 +106,7 @@ fun MessagesContent() {
                 val str = message.value
                 MessagesState.sendMessage(str)
                 message.value = "" // blow away the string the user just entered
+                GeeksvilleApplication.analytics.track("send_text") // track how many times users share channels
             },
             hintText = "Type your message here..."
         )