diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index eb59219be..c649a8dd0 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -1229,8 +1229,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
 
         val fenixNimbusMessagingController = FenixNimbusMessagingController(messagingStorage)
         val researchSurfaceDialogFragment = ResearchSurfaceDialogFragment.newInstance(
-            keyMessageText = nextMessage.data.text,
-            keyAcceptButtonText = nextMessage.data.buttonLabel,
+            keyMessageText = nextMessage.text,
+            keyAcceptButtonText = nextMessage.buttonLabel,
             keyDismissButtonText = null,
         )
 
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt
index 7fbe7e145..85b0d934e 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt
@@ -77,9 +77,9 @@ class MessageCardViewHolder(
         )
 
         MessageCard(
-            messageText = message.data.text,
-            titleText = message.data.title,
-            buttonText = message.data.buttonLabel,
+            messageText = message.text,
+            titleText = message.title,
+            buttonText = message.buttonLabel,
             messageColors = messageCardColors,
             onClick = { interactor.onMessageClicked(message) },
             onCloseButtonClick = { interactor.onMessageClosedClicked(message) },
diff --git a/app/src/main/java/org/mozilla/fenix/messaging/MessageNotificationWorker.kt b/app/src/main/java/org/mozilla/fenix/messaging/MessageNotificationWorker.kt
index 7211e0047..6a8bd3ba7 100644
--- a/app/src/main/java/org/mozilla/fenix/messaging/MessageNotificationWorker.kt
+++ b/app/src/main/java/org/mozilla/fenix/messaging/MessageNotificationWorker.kt
@@ -52,9 +52,8 @@ class MessageNotificationWorker(
                 ?: return Result.success()
 
         val currentBootUniqueIdentifier = BootUtils.getBootIdentifier(context)
-        val messageMetadata = nextMessage.metadata
         //  Device has NOT been power cycled.
-        if (messageMetadata.latestBootIdentifier == currentBootUniqueIdentifier) {
+        if (nextMessage.hasShownThisCycle(currentBootUniqueIdentifier)) {
             return Result.success()
         }
 
@@ -91,8 +90,8 @@ class MessageNotificationWorker(
         return createBaseNotification(
             context,
             ensureMarketingChannelExists(context),
-            message.data.title,
-            message.data.text,
+            message.title,
+            message.text,
             onClickPendingIntent,
             onDismissPendingIntent,
         )
@@ -189,7 +188,7 @@ class NotificationDismissedService : LifecycleService() {
 
                 if (message != null) {
                     // Update message as 'dismissed'.
-                    nimbusMessagingController.onMessageDismissed(message.metadata)
+                    nimbusMessagingController.onMessageDismissed(message)
                 }
             }
         }
@@ -220,7 +219,7 @@ class NotificationClickedReceiverActivity : ComponentActivity() {
 
             if (message != null) {
                 // Update message as 'clicked'.
-                nimbusMessagingController.onMessageClicked(message.metadata)
+                nimbusMessagingController.onMessageClicked(message)
 
                 // Create the intent.
                 val intent = nimbusMessagingController.getIntentForMessage(message)
diff --git a/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt b/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt
index 9388f3414..4d8f79ad9 100644
--- a/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt
+++ b/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt
@@ -93,7 +93,7 @@ class MessagingMiddleware(
         context.dispatch(UpdateMessages(newMessages))
         consumeMessageToShowIfNeeded(context, message)
         coroutineScope.launch {
-            controller.onMessageDismissed(message.metadata)
+            controller.onMessageDismissed(message)
         }
     }
 
@@ -103,7 +103,7 @@ class MessagingMiddleware(
     ) {
         // Update Nimbus storage.
         coroutineScope.launch {
-            controller.onMessageClicked(message.metadata)
+            controller.onMessageClicked(message)
         }
         // Update app state.
         val newMessages = removeMessage(context, message)
diff --git a/app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt
index d55001914..9dd968590 100644
--- a/app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/messaging/state/MessagingMiddlewareTest.kt
@@ -221,7 +221,7 @@ class MessagingMiddlewareTest {
         store.dispatch(Evaluate(FenixMessageSurfaceId.HOMESCREEN))
         store.waitUntilIdle()
 
-        assertEquals(1, store.state.messaging.messages.first().metadata.displayCount)
+        assertEquals(1, store.state.messaging.messages.first().displayCount)
     }
 
     @Test
@@ -286,7 +286,7 @@ class MessagingMiddlewareTest {
         store.dispatch(Evaluate(FenixMessageSurfaceId.HOMESCREEN)).joinBlocking()
         store.waitUntilIdle()
 
-        assertEquals(messageDisplayed.metadata.displayCount, store.state.messaging.messages[0].metadata.displayCount)
+        assertEquals(messageDisplayed.displayCount, store.state.messaging.messages[0].displayCount)
     }
 
     @Test