diff --git a/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java b/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java
index 7ca1e99509c7..e3e62a05dc2e 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java
@@ -109,12 +109,28 @@ public void sessionEnded() {
             }
 
             @Override
-            public void newConversationStarted(String s) {
+            public void newConversationStarted(String newMessage) {
             }
 
             @Override
-            public void userRepliedToConversation(String s) {
-                AnalyticsTracker.track(Stat.SUPPORT_SENT_REPLY_TO_SUPPORT_MESSAGE);
+            public void userRepliedToConversation(String newMessage) {
+                switch (newMessage) {
+                    case Support.UserAcceptedTheSolution:
+                        AnalyticsTracker.track(Stat.SUPPORT_USER_ACCEPTED_THE_SOLUTION);
+                        break;
+                    case Support.UserRejectedTheSolution:
+                        AnalyticsTracker.track(Stat.SUPPORT_USER_REJECTED_THE_SOLUTION);
+                        break;
+                    case Support.UserSentScreenShot:
+                        AnalyticsTracker.track(Stat.SUPPORT_USER_SENT_SCREENSHOT);
+                        break;
+                    case Support.UserReviewedTheApp:
+                        AnalyticsTracker.track(Stat.SUPPORT_USER_REVIEWED_THE_APP);
+                        break;
+                    default:
+                        AnalyticsTracker.track(Stat.SUPPORT_USER_REPLIED_TO_HELPSHIFT);
+                        break;
+                }
             }
 
             @Override
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
index 5db421c6bfb6..770770764c5e 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
@@ -137,7 +137,11 @@ public enum Stat {
         PUSH_NOTIFICATION_RECEIVED,
         PUSH_NOTIFICATION_TAPPED, // Same of opened
         SUPPORT_OPENED_HELPSHIFT_SCREEN,
-        SUPPORT_SENT_REPLY_TO_SUPPORT_MESSAGE,
+        SUPPORT_USER_ACCEPTED_THE_SOLUTION,
+        SUPPORT_USER_REJECTED_THE_SOLUTION,
+        SUPPORT_USER_SENT_SCREENSHOT,
+        SUPPORT_USER_REVIEWED_THE_APP,
+        SUPPORT_USER_REPLIED_TO_HELPSHIFT,
         LOGIN_MAGIC_LINK_EXITED,
         LOGIN_MAGIC_LINK_FAILED,
         LOGIN_MAGIC_LINK_OPENED,
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
index 217f3987ff8d..72854bea66b4 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
@@ -823,10 +823,30 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                         mixpanelInstructionsForEventName("Support - Opened Helpshift Screen");
                 instructions.addSuperPropertyToFlag("opened_helpshift_screen");
                 break;
-            case SUPPORT_SENT_REPLY_TO_SUPPORT_MESSAGE:
+            case SUPPORT_USER_ACCEPTED_THE_SOLUTION:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
-                        mixpanelInstructionsForEventName("Support - Replied to Helpshift");
-                instructions.addSuperPropertyToFlag("support_replied_to_helpshift");
+                        mixpanelInstructionsForEventName("Support - User Accepted the Solution");
+                instructions.addSuperPropertyToFlag("support_user_accepted_the_solution");
+                break;
+            case SUPPORT_USER_REJECTED_THE_SOLUTION:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Support - User Rejected the Solution");
+                instructions.addSuperPropertyToFlag("support_user_rejected_the_solution");
+                break;
+            case SUPPORT_USER_SENT_SCREENSHOT:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Support - User Sent a Screenshot");
+                instructions.addSuperPropertyToFlag("support_user_sent_screenshot");
+                break;
+            case SUPPORT_USER_REVIEWED_THE_APP:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Support - User Reviewed the App");
+                instructions.addSuperPropertyToFlag("support_user_reviewed_the_app");
+                break;
+            case SUPPORT_USER_REPLIED_TO_HELPSHIFT:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Support - User Replied to Helpshift");
+                instructions.addSuperPropertyToFlag("support_user_replied_to_helpshift");
                 break;
             case LOGIN_MAGIC_LINK_EXITED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
index de13792cadba..a3a683370005 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
@@ -456,8 +456,16 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "push_notification_alert_tapped";
             case SUPPORT_OPENED_HELPSHIFT_SCREEN:
                 return "support_helpshift_screen_opened";
-            case SUPPORT_SENT_REPLY_TO_SUPPORT_MESSAGE:
-                return "support_reply_to_support_message_sent";
+            case SUPPORT_USER_ACCEPTED_THE_SOLUTION:
+                return "support_user_accepted_the_solution";
+            case SUPPORT_USER_REJECTED_THE_SOLUTION:
+                return "support_user_rejected_the_solution";
+            case SUPPORT_USER_SENT_SCREENSHOT:
+                return "support_user_sent_screenshot";
+            case SUPPORT_USER_REVIEWED_THE_APP:
+                return "support_user_reviewed_the_app";
+            case SUPPORT_USER_REPLIED_TO_HELPSHIFT:
+                return "support_user_replied_to_helpshift";
             case LOGIN_MAGIC_LINK_EXITED:
                 return "login_magic_link_exited";
             case LOGIN_MAGIC_LINK_FAILED: