diff --git a/Apps/APN-UIKit/APN UIKit.xcodeproj/project.pbxproj b/Apps/APN-UIKit/APN UIKit.xcodeproj/project.pbxproj
index bec62a32e..5e389e5c6 100644
--- a/Apps/APN-UIKit/APN UIKit.xcodeproj/project.pbxproj	
+++ b/Apps/APN-UIKit/APN UIKit.xcodeproj/project.pbxproj	
@@ -45,9 +45,13 @@
 		46EE277929ED833D0068F9A3 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46EE277829ED833D0068F9A3 /* Settings.swift */; };
 		46EE278429EEEDF30068F9A3 /* NotificationUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46EE278329EEEDF30068F9A3 /* NotificationUtil.swift */; };
 		46EE278629F01F9C0068F9A3 /* ImageViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46EE278529F01F9B0068F9A3 /* ImageViewExtension.swift */; };
+		68050B6E2D417D100090B4BB /* InlineInAppMessageSwiftUiViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68050B6D2D417D100090B4BB /* InlineInAppMessageSwiftUiViewController.swift */; };
+		68050B722D417DAA0090B4BB /* InlineInAppMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68050B712D417DAA0090B4BB /* InlineInAppMessageView.swift */; };
+		68050B742D4246CE0090B4BB /* ColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68050B732D4246CE0090B4BB /* ColorExtension.swift */; };
 		9443F22C2A66CD650019E744 /* MetadataUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9443F22B2A66CD650019E744 /* MetadataUtil.swift */; };
 		94AF7C9F2A44BE9B004880BD /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF7C9E2A44BE9B004880BD /* BaseViewController.swift */; };
 		94C5C26C2A718E970066A072 /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C5C26B2A718E970066A072 /* DateExtension.swift */; };
+		A76FCBF62D48AE5000625DD9 /* InlineInAppMessageUikitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76FCBF52D48AE5000625DD9 /* InlineInAppMessageUikitViewController.swift */; };
 		A776886C2B9875B5004F2A49 /* DataPipelines in Frameworks */ = {isa = PBXBuildFile; productRef = A776886B2B9875B5004F2A49 /* DataPipelines */; };
 		A776886E2B9875D0004F2A49 /* DataPipelines in Frameworks */ = {isa = PBXBuildFile; productRef = A776886D2B9875D0004F2A49 /* DataPipelines */; };
 		F74F41F92A168316000D61B9 /* BuildEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = F74F41F82A168316000D61B9 /* BuildEnvironment.swift */; };
@@ -138,9 +142,13 @@
 		46EE277829ED833D0068F9A3 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
 		46EE278329EEEDF30068F9A3 /* NotificationUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationUtil.swift; sourceTree = "<group>"; };
 		46EE278529F01F9B0068F9A3 /* ImageViewExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewExtension.swift; sourceTree = "<group>"; };
+		68050B6D2D417D100090B4BB /* InlineInAppMessageSwiftUiViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineInAppMessageSwiftUiViewController.swift; sourceTree = "<group>"; };
+		68050B712D417DAA0090B4BB /* InlineInAppMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineInAppMessageView.swift; sourceTree = "<group>"; };
+		68050B732D4246CE0090B4BB /* ColorExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorExtension.swift; sourceTree = "<group>"; };
 		9443F22B2A66CD650019E744 /* MetadataUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetadataUtil.swift; sourceTree = "<group>"; };
 		94AF7C9E2A44BE9B004880BD /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
 		94C5C26B2A718E970066A072 /* DateExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateExtension.swift; sourceTree = "<group>"; };
+		A76FCBF52D48AE5000625DD9 /* InlineInAppMessageUikitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineInAppMessageUikitViewController.swift; sourceTree = "<group>"; };
 		F74F41F82A168316000D61B9 /* BuildEnvironment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BuildEnvironment.swift; sourceTree = SOURCE_ROOT; };
 		F7820EA92A15631000B346A9 /* DIGraphShared.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DIGraphShared.swift; sourceTree = "<group>"; };
 		F78934232A168E08005D3DF7 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -261,6 +269,7 @@
 		46D5D9B029E56DE000EAF40B /* View */ = {
 			isa = PBXGroup;
 			children = (
+				68050B702D417D7D0090B4BB /* Inline */,
 				46D5D9B829E5887A00EAF40B /* Extension */,
 				46D5D9B329E56F1E00EAF40B /* Customisation */,
 				46D5D9B129E56E0E00EAF40B /* LoginViewController.swift */,
@@ -268,6 +277,7 @@
 				46D5D9C629E59A5E00EAF40B /* CustomDataViewController.swift */,
 				46D5D9CB29E830AD00EAF40B /* SettingsViewController.swift */,
 				4650331029F696B8001B6552 /* DeepLinkViewController.swift */,
+				A76FCBF52D48AE5000625DD9 /* InlineInAppMessageUikitViewController.swift */,
 				94AF7C9E2A44BE9B004880BD /* BaseViewController.swift */,
 			);
 			path = View;
@@ -291,6 +301,7 @@
 				46EE275C29E9ECE60068F9A3 /* StringExtension.swift */,
 				46EE278529F01F9B0068F9A3 /* ImageViewExtension.swift */,
 				94C5C26B2A718E970066A072 /* DateExtension.swift */,
+				68050B732D4246CE0090B4BB /* ColorExtension.swift */,
 			);
 			path = Extension;
 			sourceTree = "<group>";
@@ -358,6 +369,15 @@
 			path = Util;
 			sourceTree = "<group>";
 		};
+		68050B702D417D7D0090B4BB /* Inline */ = {
+			isa = PBXGroup;
+			children = (
+				68050B6D2D417D100090B4BB /* InlineInAppMessageSwiftUiViewController.swift */,
+				68050B712D417DAA0090B4BB /* InlineInAppMessageView.swift */,
+			);
+			path = Inline;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -544,6 +564,7 @@
 				46D5D9B229E56E0E00EAF40B /* LoginViewController.swift in Sources */,
 				46D5D98529E459D600EAF40B /* ViewController.swift in Sources */,
 				46D5D9BC29E58D2000EAF40B /* StoryboardExtension.swift in Sources */,
+				A76FCBF62D48AE5000625DD9 /* InlineInAppMessageUikitViewController.swift in Sources */,
 				4650331329F69845001B6552 /* DeepLinksHandlerUtil.swift in Sources */,
 				46D5D98129E459D600EAF40B /* AppDelegate.swift in Sources */,
 				94AF7C9F2A44BE9B004880BD /* BaseViewController.swift in Sources */,
@@ -551,6 +572,7 @@
 				46EE276029E9F1BD0068F9A3 /* Storage.swift in Sources */,
 				46EE278629F01F9C0068F9A3 /* ImageViewExtension.swift in Sources */,
 				94C5C26C2A718E970066A072 /* DateExtension.swift in Sources */,
+				68050B722D417DAA0090B4BB /* InlineInAppMessageView.swift in Sources */,
 				46D5D9BF29E58DE700EAF40B /* LoginRouter.swift in Sources */,
 				46D5D9C529E596F300EAF40B /* ViewControllerExtension.swift in Sources */,
 				46D5D98329E459D600EAF40B /* SceneDelegate.swift in Sources */,
@@ -559,10 +581,12 @@
 				46EE276229ED679D0068F9A3 /* UserDefaultKeys.swift in Sources */,
 				F7820EAA2A15631000B346A9 /* DIGraphShared.swift in Sources */,
 				46EE277629ED802D0068F9A3 /* DIDependencies.swift in Sources */,
+				68050B742D4246CE0090B4BB /* ColorExtension.swift in Sources */,
 				46EE275D29E9ECE60068F9A3 /* StringExtension.swift in Sources */,
 				46D5D9C129E58EB600EAF40B /* DashboardViewController.swift in Sources */,
 				46EE277429ED722E0068F9A3 /* AutoMockable.generated.swift in Sources */,
 				46EE277329ED722E0068F9A3 /* AutoDependencyInjection.generated.swift in Sources */,
+				68050B6E2D417D100090B4BB /* InlineInAppMessageSwiftUiViewController.swift in Sources */,
 				4650331129F696B8001B6552 /* DeepLinkViewController.swift in Sources */,
 				46EE274D29E9CBCE0068F9A3 /* SettingsRouter.swift in Sources */,
 				9443F22C2A66CD650019E744 /* MetadataUtil.swift in Sources */,
diff --git a/Apps/APN-UIKit/APN UIKit/Base.lproj/Main.storyboard b/Apps/APN-UIKit/APN UIKit/Base.lproj/Main.storyboard
index 257224932..a83d4ba19 100644
--- a/Apps/APN-UIKit/APN UIKit/Base.lproj/Main.storyboard	
+++ b/Apps/APN-UIKit/APN UIKit/Base.lproj/Main.storyboard	
@@ -56,7 +56,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iXp-Fu-ehx">
-                                        <rect key="frame" x="20" y="240" width="344" height="35"/>
+                                        <rect key="frame" x="20" y="240.00000000000003" width="344" height="34.333333333333343"/>
                                         <color key="tintColor" red="0.44313725490196076" green="0.19215686274509802" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain" title="Generate Random Login"/>
@@ -154,13 +154,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What would you like to test?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gm6-Cg-tg6">
-                                <rect key="frame" x="10" y="157.66666666666666" width="394" height="27.333333333333343"/>
+                                <rect key="frame" x="10" y="91.666666666666671" width="394" height="27.333333333333329"/>
                                 <fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="20"/>
                                 <color key="textColor" red="0.24313725489999999" green="0.24313725489999999" blue="0.24313725489999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="AIH-WX-Xne">
-                                <rect key="frame" x="20" y="225" width="374" height="446"/>
+                                <rect key="frame" x="20" y="159" width="374" height="578"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yOE-0O-ICW" customClass="ThemeButton" customModule="APN_UIKit" customModuleProvider="target">
                                         <rect key="frame" x="94.666666666666686" y="0.0" width="185" height="50"/>
@@ -241,8 +241,34 @@
                                             <action selector="send3rdPartyPush:" destination="0ax-47-4zI" eventType="touchUpInside" id="DR5-oa-iJr"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lb4-oP-0VA" userLabel="Inline examples (UiKit)" customClass="ThemeButton" customModule="APN_UIKit" customModuleProvider="target">
+                                        <rect key="frame" x="80.666666666666671" y="404" width="212.66666666666663" height="34.333333333333314"/>
+                                        <color key="backgroundColor" red="0.2352941036" green="0.26274511220000002" blue="0.49019610879999997" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="185" id="R99-5x-1ES"/>
+                                        </constraints>
+                                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <state key="normal" title="Button"/>
+                                        <buttonConfiguration key="configuration" style="plain" title="Inline Examples (SwiftUI)"/>
+                                        <connections>
+                                            <action selector="openInlineSwiftUiExamples:" destination="0ax-47-4zI" eventType="touchUpInside" id="n9s-20-5vO"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xg6-ZV-bDY" customClass="ThemeButton" customModule="APN_UIKit" customModuleProvider="target">
+                                        <rect key="frame" x="89.666666666666671" y="470" width="194.66666666666663" height="34.333333333333314"/>
+                                        <color key="backgroundColor" red="0.23529411759999999" green="0.26274509800000001" blue="0.49019607840000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="185" id="CXH-fW-VDm"/>
+                                        </constraints>
+                                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <state key="normal" title="Button"/>
+                                        <buttonConfiguration key="configuration" style="plain" title="Inline Examples (UIKit)"/>
+                                        <connections>
+                                            <action selector="openInlineUikitExamples:" destination="0ax-47-4zI" eventType="touchUpInside" id="BOs-sF-hvl"/>
+                                        </connections>
+                                    </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gSy-pH-Zuu" customClass="ThemeButton" customModule="APN_UIKit" customModuleProvider="target">
-                                        <rect key="frame" x="94.666666666666686" y="396" width="185" height="50"/>
+                                        <rect key="frame" x="94.666666666666686" y="528" width="185" height="50"/>
                                         <color key="backgroundColor" red="0.23529411759999999" green="0.26274509800000001" blue="0.49019607840000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                         <constraints>
                                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="185" id="uv2-HN-pr3"/>
@@ -271,7 +297,7 @@
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What would you like to test?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mIk-22-9js">
-                                <rect key="frame" x="10" y="130.33333333333334" width="394" height="27.333333333333343"/>
+                                <rect key="frame" x="10" y="64.333333333333329" width="394" height="27.333333333333329"/>
                                 <fontDescription key="fontDescription" name="Avenir-Heavy" family="Avenir" pointSize="20"/>
                                 <color key="textColor" red="0.24313725489999999" green="0.24313725489999999" blue="0.24313725489999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
@@ -869,6 +895,37 @@
             </objects>
             <point key="canvasLocation" x="4202" y="4"/>
         </scene>
+        <!--Inline In App Message Swift Ui View Controller-->
+        <scene sceneID="UVM-d0-6Zn">
+            <objects>
+                <viewController storyboardIdentifier="InlineInAppMessageSwiftUiViewController" id="eep-l7-eum" customClass="InlineInAppMessageSwiftUiViewController" customModule="APN_UIKit" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Vni-O4-X2d">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="tcJ-0P-ZLy"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                </viewController>
+                <navigationItem id="OhY-DD-4vP"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="hZc-t9-INr" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4912" y="8"/>
+        </scene>
+        <!--Inline In App Message Uikit View Controller-->
+        <scene sceneID="XvK-Jp-F9O">
+            <objects>
+                <viewController storyboardIdentifier="InlineInAppMessageUikitViewController" id="aGf-c1-OHL" userLabel="Inline In App Message Uikit View Controller" customClass="InlineInAppMessageUikitViewController" customModule="APN_UIKit" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8oU-G6-4m4">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="YGe-lJ-MdQ"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Jgv-iL-1eI" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="5651" y="7"/>
+        </scene>
     </scenes>
     <resources>
         <image name="copy" width="512" height="512"/>
diff --git a/Apps/APN-UIKit/APN UIKit/Router/DashboardRouter.swift b/Apps/APN-UIKit/APN UIKit/Router/DashboardRouter.swift
index 1cdcc806f..1654a1129 100644
--- a/Apps/APN-UIKit/APN UIKit/Router/DashboardRouter.swift	
+++ b/Apps/APN-UIKit/APN UIKit/Router/DashboardRouter.swift	
@@ -5,6 +5,8 @@ protocol DashboardRouting {
     func routeToLogin()
     func routeToCustomDataScreen(forSource source: CustomDataSource)
     func routeToSettings(_ withInfo: [String: String]?)
+    func routeToInlineSwiftUiExamplesScreen()
+    func routeToInlineUikitExamplesScreen()
 }
 
 class DashboardRouter: DashboardRouting {
@@ -34,4 +36,14 @@ class DashboardRouter: DashboardRouting {
         }
         dashboardViewController?.navigationController?.pushViewController(viewController, animated: true)
     }
+
+    func routeToInlineSwiftUiExamplesScreen() {
+        let viewController = InlineInAppMessageSwiftUiViewController.newInstance()
+        dashboardViewController?.navigationController?.pushViewController(viewController, animated: true)
+    }
+
+    func routeToInlineUikitExamplesScreen() {
+        let viewController = InlineInAppMessageUikitViewController.newInstance()
+        dashboardViewController?.navigationController?.pushViewController(viewController, animated: true)
+    }
 }
diff --git a/Apps/APN-UIKit/APN UIKit/View/DashboardViewController.swift b/Apps/APN-UIKit/APN UIKit/View/DashboardViewController.swift
index 90f0f5f5b..6bff8a11e 100644
--- a/Apps/APN-UIKit/APN UIKit/View/DashboardViewController.swift	
+++ b/Apps/APN-UIKit/APN UIKit/View/DashboardViewController.swift	
@@ -124,6 +124,14 @@ class DashboardViewController: BaseViewController {
         dashboardRouter?.routeToCustomDataScreen(forSource: .profileAttributes)
     }
 
+    @IBAction func openInlineSwiftUiExamples(_ sender: UIButton) {
+        dashboardRouter?.routeToInlineSwiftUiExamplesScreen()
+    }
+
+    @IBAction func openInlineUikitExamples(_ sender: UIButton) {
+        dashboardRouter?.routeToInlineUikitExamplesScreen()
+    }
+
     @IBAction func showPushPrompt(_ sender: UIButton) {
         notificationUtil.getPushPermission { status in
             if status == .notDetermined {
diff --git a/Apps/APN-UIKit/APN UIKit/View/Extension/ColorExtension.swift b/Apps/APN-UIKit/APN UIKit/View/Extension/ColorExtension.swift
new file mode 100644
index 000000000..07b2c91a4
--- /dev/null
+++ b/Apps/APN-UIKit/APN UIKit/View/Extension/ColorExtension.swift	
@@ -0,0 +1,9 @@
+import SwiftUI
+
+extension Color {
+    static let lightBlue = Color(
+        red: 60 / 255.0,
+        green: 67 / 255.0,
+        blue: 125 / 255.0
+    )
+}
diff --git a/Apps/APN-UIKit/APN UIKit/View/Inline/InlineInAppMessageSwiftUiViewController.swift b/Apps/APN-UIKit/APN UIKit/View/Inline/InlineInAppMessageSwiftUiViewController.swift
new file mode 100644
index 000000000..42c6e13aa
--- /dev/null
+++ b/Apps/APN-UIKit/APN UIKit/View/Inline/InlineInAppMessageSwiftUiViewController.swift	
@@ -0,0 +1,32 @@
+import SwiftUI
+import UIKit
+
+class InlineInAppMessageSwiftUiViewController: BaseViewController {
+    static func newInstance() -> InlineInAppMessageSwiftUiViewController {
+        UIStoryboard.getViewController(identifier: "InlineInAppMessageSwiftUiViewController")
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        navigationController?.isNavigationBarHidden = false
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        let inlineInAppMessageView = InlineInAppMessageView()
+        let hostingController = UIHostingController(rootView: inlineInAppMessageView)
+
+        addChild(hostingController)
+        view.addSubview(hostingController.view)
+
+        hostingController.view.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            hostingController.view.topAnchor.constraint(equalTo: view.topAnchor),
+            hostingController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+            hostingController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            hostingController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor)
+        ])
+
+        hostingController.didMove(toParent: self)
+    }
+}
diff --git a/Apps/APN-UIKit/APN UIKit/View/Inline/InlineInAppMessageView.swift b/Apps/APN-UIKit/APN UIKit/View/Inline/InlineInAppMessageView.swift
new file mode 100644
index 000000000..65361eec5
--- /dev/null
+++ b/Apps/APN-UIKit/APN UIKit/View/Inline/InlineInAppMessageView.swift	
@@ -0,0 +1,95 @@
+import CioMessagingInApp
+import SwiftUI
+
+struct InlineInAppMessageView: View {
+    var body: some View {
+        VStack {
+            InlineMessage(elementId: "sticky-header")
+                .frame(maxWidth: .infinity)
+
+            ScrollView {
+                CardView()
+                    .frame(maxWidth: .infinity)
+
+                RectangleView()
+
+                SquaresView()
+                    .frame(height: 160)
+
+                InlineMessage(elementId: "inline")
+                    .frame(maxWidth: .infinity)
+
+                CardView()
+                    .frame(maxWidth: .infinity)
+
+                RectangleView()
+
+                CardView()
+                    .frame(maxWidth: .infinity)
+
+                RectangleView()
+
+                InlineMessage(elementId: "below-fold")
+                    .frame(maxWidth: .infinity)
+
+            }.padding(.horizontal, 10)
+        }
+    }
+}
+
+struct RectangleView: View {
+    var body: some View {
+        Rectangle()
+            .fill(Color.lightBlue)
+            .frame(height: 160)
+            .frame(maxWidth: .infinity)
+    }
+}
+
+struct CardView: View {
+    var body: some View {
+        HStack(spacing: 20) {
+            Color.lightBlue
+                .frame(width: 150, height: 120)
+                .cornerRadius(8)
+
+            VStack(alignment: .leading, spacing: 5) {
+                Color.lightBlue
+                    .frame(width: 120, height: 15)
+                    .cornerRadius(4)
+
+                Color.lightBlue
+                    .frame(width: 100, height: 15)
+                    .cornerRadius(4)
+
+                Spacer()
+                    .frame(height: 15)
+
+                Color.lightBlue
+                    .frame(width: 80, height: 30)
+                    .cornerRadius(4)
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .frame(height: 120)
+        }
+    }
+}
+
+struct SquaresView: View {
+    var body: some View {
+        HStack {
+            Color.lightBlue
+                .frame(minWidth: 0, maxWidth: .infinity)
+
+            Color.lightBlue
+                .frame(minWidth: 0, maxWidth: .infinity)
+
+            Color.lightBlue
+                .frame(minWidth: 0, maxWidth: .infinity)
+        }
+    }
+}
+
+#Preview {
+    InlineInAppMessageView()
+}
diff --git a/Apps/APN-UIKit/APN UIKit/View/InlineInAppMessageUikitViewController.swift b/Apps/APN-UIKit/APN UIKit/View/InlineInAppMessageUikitViewController.swift
new file mode 100644
index 000000000..ff8828187
--- /dev/null
+++ b/Apps/APN-UIKit/APN UIKit/View/InlineInAppMessageUikitViewController.swift	
@@ -0,0 +1,197 @@
+import CioMessagingInApp
+import UIKit
+
+extension UIColor {
+    static let lightBlue = UIColor(red: 0.8, green: 0.9, blue: 1.0, alpha: 1.0)
+}
+
+class InlineInAppMessageUikitViewController: BaseViewController {
+    static func newInstance() -> InlineInAppMessageUikitViewController {
+        UIStoryboard.getViewController(identifier: "InlineInAppMessageUikitViewController")
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        navigationController?.isNavigationBarHidden = false
+    }
+
+    private let stickyHeaderMessage = InlineMessageUIView(elementId: "sticky-header")
+    private let inlineMessage = InlineMessageUIView(elementId: "inline")
+    private let belowFoldMessage = InlineMessageUIView(elementId: "below-fold")
+
+    private let scrollView = UIScrollView()
+    private let contentStackView = UIStackView()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // 1. Add sticky header (non-scrollable)
+        view.addSubview(stickyHeaderMessage)
+        stickyHeaderMessage.translatesAutoresizingMaskIntoConstraints = false
+
+        NSLayoutConstraint.activate([
+            stickyHeaderMessage.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
+            stickyHeaderMessage.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            stickyHeaderMessage.trailingAnchor.constraint(equalTo: view.trailingAnchor)
+        ])
+
+        // 2. Add scroll view for the remaining content
+        view.addSubview(scrollView)
+        scrollView.translatesAutoresizingMaskIntoConstraints = false
+
+        NSLayoutConstraint.activate([
+            scrollView.topAnchor.constraint(equalTo: stickyHeaderMessage.bottomAnchor),
+            scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            scrollView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            scrollView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
+        ])
+
+        // 3. Inside the scroll view, place a vertical stack view
+        scrollView.addSubview(contentStackView)
+
+        contentStackView.axis = .vertical
+        contentStackView.alignment = .fill
+        contentStackView.spacing = 10
+
+        contentStackView.isLayoutMarginsRelativeArrangement = true
+        contentStackView.layoutMargins = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10)
+
+        contentStackView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            contentStackView.topAnchor.constraint(equalTo: scrollView.contentLayoutGuide.topAnchor),
+            contentStackView.bottomAnchor.constraint(equalTo: scrollView.contentLayoutGuide.bottomAnchor),
+            contentStackView.leadingAnchor.constraint(equalTo: scrollView.contentLayoutGuide.leadingAnchor),
+            contentStackView.trailingAnchor.constraint(equalTo: scrollView.contentLayoutGuide.trailingAnchor),
+
+            // Match the stack view's width to the scroll view's visible width
+            contentStackView.widthAnchor.constraint(equalTo: scrollView.frameLayoutGuide.widthAnchor)
+        ])
+
+        // 4. Add content to stack view (scrollable portion)
+        contentStackView.addArrangedSubview(UICardView())
+        contentStackView.addArrangedSubview(UIRectangleView())
+        contentStackView.addArrangedSubview(UISquaresView())
+
+        contentStackView.addArrangedSubview(inlineMessage)
+
+        contentStackView.addArrangedSubview(UICardView())
+        contentStackView.addArrangedSubview(UIRectangleView())
+
+        contentStackView.addArrangedSubview(UICardView())
+        contentStackView.addArrangedSubview(UIRectangleView())
+
+        contentStackView.addArrangedSubview(belowFoldMessage)
+    }
+}
+
+private class UIRectangleView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = .lightBlue
+
+        // Force height to 160
+        translatesAutoresizingMaskIntoConstraints = false
+        heightAnchor.constraint(equalToConstant: 160).isActive = true
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+private class UICardView: UIStackView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+
+        axis = .horizontal
+        alignment = .top
+        spacing = 20
+        distribution = .fill
+        translatesAutoresizingMaskIntoConstraints = false
+
+        let leftView = UIView()
+        leftView.backgroundColor = .lightBlue
+        leftView.layer.cornerRadius = 8
+        leftView.translatesAutoresizingMaskIntoConstraints = false
+        leftView.widthAnchor.constraint(equalToConstant: 150).isActive = true
+        leftView.heightAnchor.constraint(equalToConstant: 120).isActive = true
+
+        let rightStack = UIStackView()
+        rightStack.axis = .vertical
+        rightStack.alignment = .leading
+        rightStack.distribution = .fill
+        rightStack.spacing = 5
+        rightStack.translatesAutoresizingMaskIntoConstraints = false
+
+        let bar1 = makeBar(width: 120, height: 15)
+        let bar2 = makeBar(width: 100, height: 15)
+        let spacer = makeSpacer(height: 15)
+        let bar3 = makeBar(width: 80, height: 30)
+
+        rightStack.addArrangedSubview(bar1)
+        rightStack.addArrangedSubview(bar2)
+        rightStack.addArrangedSubview(spacer)
+        rightStack.addArrangedSubview(bar3)
+
+        addArrangedSubview(leftView)
+        addArrangedSubview(rightStack)
+
+        heightAnchor.constraint(equalToConstant: 120).isActive = true
+    }
+
+    @available(*, unavailable)
+    required init(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    private func makeBar(width: CGFloat, height: CGFloat) -> UIView {
+        let bar = UIView()
+        bar.backgroundColor = .lightBlue
+        bar.layer.cornerRadius = 4
+        bar.translatesAutoresizingMaskIntoConstraints = false
+
+        bar.widthAnchor.constraint(equalToConstant: width).isActive = true
+        bar.heightAnchor.constraint(equalToConstant: height).isActive = true
+        return bar
+    }
+
+    private func makeSpacer(height: CGFloat) -> UIView {
+        let spacer = UIView()
+        spacer.translatesAutoresizingMaskIntoConstraints = false
+        spacer.heightAnchor.constraint(equalToConstant: height).isActive = true
+        return spacer
+    }
+}
+
+private class UISquaresView: UIStackView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+
+        axis = .horizontal
+        distribution = .fillEqually
+        alignment = .fill
+        spacing = 0
+        translatesAutoresizingMaskIntoConstraints = false
+
+        let square1 = UIView()
+        square1.backgroundColor = .lightBlue
+
+        let square2 = UIView()
+        square2.backgroundColor = .lightBlue
+
+        let square3 = UIView()
+        square3.backgroundColor = .lightBlue
+
+        addArrangedSubview(square1)
+        addArrangedSubview(square2)
+        addArrangedSubview(square3)
+
+        heightAnchor.constraint(equalToConstant: 160).isActive = true
+    }
+
+    @available(*, unavailable)
+    required init(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
diff --git a/Sources/MessagingPush/Util/DeepLinkUtil.swift b/Sources/Common/Util/DeepLinkUtil.swift
similarity index 88%
rename from Sources/MessagingPush/Util/DeepLinkUtil.swift
rename to Sources/Common/Util/DeepLinkUtil.swift
index 286e99bcc..c2094d4bd 100644
--- a/Sources/MessagingPush/Util/DeepLinkUtil.swift
+++ b/Sources/Common/Util/DeepLinkUtil.swift
@@ -1,13 +1,12 @@
-import CioInternalCommon
 import Foundation
 
-protocol DeepLinkUtil: AutoMockable {
+public protocol DeepLinkUtil: AutoMockable {
     func handleDeepLink(_ deepLinkUrl: URL)
 }
 
 @available(iOSApplicationExtension, unavailable)
 // sourcery: InjectRegisterShared = "DeepLinkUtil"
-class DeepLinkUtilImpl: DeepLinkUtil {
+public class DeepLinkUtilImpl: DeepLinkUtil {
     private let logger: Logger
     private let uiKit: UIKitWrapper
 
@@ -16,7 +15,7 @@ class DeepLinkUtilImpl: DeepLinkUtil {
         self.uiKit = uiKitWrapper
     }
 
-    func handleDeepLink(_ deepLinkUrl: URL) {
+    public func handleDeepLink(_ deepLinkUrl: URL) {
         logger.info("Found a deep link inside of a push notification.")
         logger.debug("deep link found in push: \(deepLinkUrl)")
 
@@ -41,6 +40,8 @@ class DeepLinkUtilImpl: DeepLinkUtil {
         if !ifHandled {
             logger.debug("Opening deep link through system call. Deep link: \(deepLinkUrl)")
             uiKit.open(url: deepLinkUrl)
+        } else {
+            logger.debug("Handled by NSUserActivity")
         }
     }
 }
diff --git a/Sources/Common/Util/JsonAdapter.swift b/Sources/Common/Util/JsonAdapter.swift
index 3dec67b2c..20a0a200e 100644
--- a/Sources/Common/Util/JsonAdapter.swift
+++ b/Sources/Common/Util/JsonAdapter.swift
@@ -59,18 +59,43 @@ public class JsonAdapter {
         self.log = log
     }
 
+    // MARK: Dictionary to JSON
+
     public func fromDictionary<T: Decodable>(_ dictionary: [AnyHashable: Any]) -> T? {
-        do {
-            let jsonData = try JSONSerialization.data(withJSONObject: dictionary)
+        commonDecodeDictionary(dictionary)
+    }
 
-            return fromJson(jsonData)
-        } catch {
-            log.error("\(error.localizedDescription), dictionary: \(dictionary)")
+    public func fromDictionary<T: Decodable>(_ dictionary: [[AnyHashable: Any]]) -> T? {
+        commonDecodeDictionary(dictionary)
+    }
+
+    public func fromDictionary(_ dictionary: [AnyHashable: Any]) -> Data? {
+        commonDecodeDictionaryToData(dictionary)
+    }
+
+    public func fromDictionary(_ dictionary: [[AnyHashable: Any]]) -> Data? {
+        commonDecodeDictionaryToData(dictionary)
+    }
+
+    private func commonDecodeDictionary<T: Decodable>(_ dictionary: Any) -> T? {
+        guard let data = commonDecodeDictionaryToData(dictionary) else {
+            return nil
         }
 
+        return fromJson(data)
+    }
+
+    private func commonDecodeDictionaryToData(_ dictionary: Any) -> Data? {
+        do {
+            return try JSONSerialization.data(withJSONObject: dictionary)
+        } catch {
+            log.error("\(error.localizedDescription), object: \(dictionary)")
+        }
         return nil
     }
 
+    // MARK: JSON to Dictionary
+
     public func toDictionary<T: Encodable>(_ obj: T) -> [AnyHashable: Any]? {
         guard let data = toJson(obj) else {
             return nil
diff --git a/Sources/Common/autogenerated/AutoDependencyInjection.generated.swift b/Sources/Common/autogenerated/AutoDependencyInjection.generated.swift
index 5b2934f59..609337d3b 100644
--- a/Sources/Common/autogenerated/AutoDependencyInjection.generated.swift
+++ b/Sources/Common/autogenerated/AutoDependencyInjection.generated.swift
@@ -83,6 +83,9 @@ extension DIGraphShared {
         _ = sdkClient
         countDependenciesResolved += 1
 
+        _ = deepLinkUtil
+        countDependenciesResolved += 1
+
         _ = deviceMetricsGrabber
         countDependenciesResolved += 1
 
@@ -273,6 +276,18 @@ extension DIGraphShared {
             customSdkClient
     }
 
+    // DeepLinkUtil
+    @available(iOSApplicationExtension, unavailable)
+    public var deepLinkUtil: DeepLinkUtil {
+        getOverriddenInstance() ??
+            newDeepLinkUtil
+    }
+
+    @available(iOSApplicationExtension, unavailable)
+    private var newDeepLinkUtil: DeepLinkUtil {
+        DeepLinkUtilImpl(logger: logger, uiKitWrapper: uIKitWrapper)
+    }
+
     // DeviceMetricsGrabber
     var deviceMetricsGrabber: DeviceMetricsGrabber {
         getOverriddenInstance() ??
diff --git a/Sources/Common/autogenerated/AutoMockable.generated.swift b/Sources/Common/autogenerated/AutoMockable.generated.swift
index 67e47a135..953d595cf 100644
--- a/Sources/Common/autogenerated/AutoMockable.generated.swift
+++ b/Sources/Common/autogenerated/AutoMockable.generated.swift
@@ -493,6 +493,57 @@ public class CustomerIOInstanceMock: CustomerIOInstance, Mock {
     }
 }
 
+/**
+ Class to easily create a mocked version of the `DeepLinkUtil` class.
+ This class is equipped with functions and properties ready for you to mock!
+
+ Note: This file is automatically generated. This means the mocks should always be up-to-date and has a consistent API.
+ See the SDK documentation to learn the basics behind using the mock classes in the SDK.
+ */
+public class DeepLinkUtilMock: DeepLinkUtil, Mock {
+    /// If *any* interactions done on mock. `true` if any method or property getter/setter called.
+    public var mockCalled: Bool = false //
+
+    public init() {
+        Mocks.shared.add(mock: self)
+    }
+
+    public func resetMock() {
+        handleDeepLinkCallsCount = 0
+        handleDeepLinkReceivedArguments = nil
+        handleDeepLinkReceivedInvocations = []
+
+        mockCalled = false // do last as resetting properties above can make this true
+    }
+
+    // MARK: - handleDeepLink
+
+    /// Number of times the function was called.
+    @Atomic public private(set) var handleDeepLinkCallsCount = 0
+    /// `true` if the function was ever called.
+    public var handleDeepLinkCalled: Bool {
+        handleDeepLinkCallsCount > 0
+    }
+
+    /// The arguments from the *last* time the function was called.
+    @Atomic public private(set) var handleDeepLinkReceivedArguments: URL?
+    /// Arguments from *all* of the times that the function was called.
+    @Atomic public private(set) var handleDeepLinkReceivedInvocations: [URL] = []
+    /**
+     Set closure to get called when function gets called. Great way to test logic or return a value for the function.
+     */
+    public var handleDeepLinkClosure: ((URL) -> Void)?
+
+    /// Mocked function for `handleDeepLink(_ deepLinkUrl: URL)`. Your opportunity to return a mocked value and check result of mock in test code.
+    public func handleDeepLink(_ deepLinkUrl: URL) {
+        mockCalled = true
+        handleDeepLinkCallsCount += 1
+        handleDeepLinkReceivedArguments = deepLinkUrl
+        handleDeepLinkReceivedInvocations.append(deepLinkUrl)
+        handleDeepLinkClosure?(deepLinkUrl)
+    }
+}
+
 /**
  Class to easily create a mocked version of the `DeviceInfo` class.
  This class is equipped with functions and properties ready for you to mock!
diff --git a/Sources/MessagingInApp/Extensions/UIViewExtensions.swift b/Sources/MessagingInApp/Extensions/UIViewExtensions.swift
new file mode 100644
index 000000000..98b62b5f8
--- /dev/null
+++ b/Sources/MessagingInApp/Extensions/UIViewExtensions.swift
@@ -0,0 +1,35 @@
+import Foundation
+import UIKit
+
+extension UIView {
+    // Find the topmost superview in the view hierarchy. Probably the UIView of the UIViewController the UIView is nested in.
+    func getRootSuperview() -> UIView? {
+        guard var rootSuperview = superview else {
+            return nil // no superview, return nil early.
+        }
+
+        while true {
+            if let nextLevelSuperview = rootSuperview.superview {
+                rootSuperview = nextLevelSuperview
+            } else {
+                return rootSuperview
+            }
+        }
+    }
+
+    var heightConstraints: [NSLayoutConstraint] {
+        constraints.filter { $0.firstAnchor == heightAnchor }
+    }
+
+    var widthConstraints: [NSLayoutConstraint] {
+        constraints.filter { $0.firstAnchor == widthAnchor }
+    }
+
+    var heightConstraint: NSLayoutConstraint? {
+        heightConstraints.first
+    }
+
+    var widthConstraint: NSLayoutConstraint? {
+        widthConstraints.first
+    }
+}
diff --git a/Sources/MessagingInApp/Gist/Gist.swift b/Sources/MessagingInApp/Gist/Gist.swift
index 1bc66c28c..7de0ae1a0 100644
--- a/Sources/MessagingInApp/Gist/Gist.swift
+++ b/Sources/MessagingInApp/Gist/Gist.swift
@@ -86,7 +86,7 @@ class Gist: GistProvider {
 
     func dismissMessage() {
         inAppMessageManager.fetchState { [self] state in
-            guard case .displayed(let message) = state.currentMessageState else {
+            guard case .displayed(let message) = state.modalMessageState else {
                 return
             }
 
diff --git a/Sources/MessagingInApp/Gist/Managers/InlineMessageManager.swift b/Sources/MessagingInApp/Gist/Managers/InlineMessageManager.swift
new file mode 100644
index 000000000..0c840574e
--- /dev/null
+++ b/Sources/MessagingInApp/Gist/Managers/InlineMessageManager.swift
@@ -0,0 +1,135 @@
+import CioInternalCommon
+import Foundation
+import UIKit
+
+// MARK: - InlineMessageManagerDelegate
+
+/// Callbacks specific to inline message events.
+protocol InlineMessageManagerDelegate: AnyObject {
+    /// Called when the inline web message (HTML) size changes
+    func sizeChanged(width: CGFloat, height: CGFloat)
+    /// Called when the inline message is closed (via a "close" action)
+    func onCloseAction()
+    /**
+     Called when an inline button or link is tapped.
+     Return `true` if your delegate handled the action entirely (so the manager does nothing more).
+     Return `false` if you'd like the manager to continue its normal flow.
+     */
+    func onInlineButtonAction(
+        message: Message,
+        currentRoute: String,
+        action: String,
+        name: String
+    ) -> Bool
+    /// Called when the inline message is about to change to a new template (if supported)
+    func willChangeMessage(newTemplateId: String)
+}
+
+// MARK: - InlineMessageManager
+
+/// A `BaseMessageManager` subclass that displays an in-app message inline (embedded in your UI).
+/// Rather than presenting a modal, it uses a `GistView` that you place in a view hierarchy.
+class InlineMessageManager: BaseMessageManager {
+    public weak var inlineMessageDelegate: InlineMessageManagerDelegate?
+
+    // Expose the GistView for embedding.
+    // Also set ourselves as the GistViewDelegate if not already set.
+    public var inlineMessageView: GistView {
+        if gistView.delegate == nil {
+            gistView.delegate = self
+        }
+        return gistView
+    }
+
+    // MARK: - Overriding from Base
+
+    /// Called when the in-app state changes to `.displayed`.
+    /// Inline typically means the content is ready and the `inlineMessageView` is or can be added to the UI.
+    func onMessageDisplayed() {
+        logger.logWithModuleTag(
+            "Inline message displayed: \(currentMessage.describeForLogs)",
+            level: .debug
+        )
+        // If needed, you might notify your delegate that it's displayed or ready.
+        // e.g., inlineMessageDelegate?.didDisplayInlineMessage?()
+    }
+
+    /// Called when the message is dismissed (or reset).
+    /// Typically remove the web engine, unsubscribe, and optionally remove the inline view.
+    func onMessageDismissed(messageState: InlineMessageState) {
+        logger.logWithModuleTag(
+            "Inline message dismissed: \(currentMessage.describeForLogs)",
+            level: .debug
+        )
+
+        removeEngineWebView()
+
+        // If the message was explicitly dismissed, fetch new messages from queue
+        if case .dismissed = messageState {
+            gist.fetchUserMessagesFromRemoteQueue()
+        }
+    }
+
+    // MARK: - Additional Inline Logic
+
+    /// Manually closes the inline message (for example, if your app’s UI has a "Close" button).
+    /// This will trigger the normal in-app dismissal flow,
+    /// which eventually calls `onMessageDismissed(messageState:)`.
+    public func closeInlineMessage() {
+        // Notify delegate that a close action occurred
+        inlineMessageDelegate?.onCloseAction()
+
+        // Trigger the store to dismiss
+        inAppMessageManager.dispatch(
+            action: .dismissMessage(
+                message: currentMessage,
+                viaCloseAction: true
+            )
+        )
+    }
+}
+
+// MARK: - GistViewDelegate
+
+extension InlineMessageManager: GistViewDelegate {
+    public func sizeChanged(message: Message, width: CGFloat, height: CGFloat) {
+        // Pass the size change event to the inlineMessageDelegate
+        inlineMessageDelegate?.sizeChanged(width: width, height: height)
+    }
+
+    public func action(
+        message: Message,
+        currentRoute: String,
+        action: String,
+        name: String
+    ) {
+        // Let the inlineMessageDelegate have a chance to handle the action
+        guard let delegate = inlineMessageDelegate,
+              delegate.onInlineButtonAction(
+                  message: message,
+                  currentRoute: currentRoute,
+                  action: action,
+                  name: name
+              )
+        else {
+            // If no delegate or delegate didn't handle it, pass to in-app manager
+            inAppMessageManager.dispatch(
+                action: .engineAction(
+                    action: .tap(
+                        message: message,
+                        route: currentRoute,
+                        name: name,
+                        action: action
+                    )
+                )
+            )
+            return
+        }
+    }
+
+    /// If your app uses multiple message templates and may switch to a new template ID,
+    /// you can forward that event here if the `GistView` notifies you:
+    public func willChangeMessage(newTemplateId: String) {
+        inlineMessageDelegate?.willChangeMessage(newTemplateId: newTemplateId)
+    }
+}
diff --git a/Sources/MessagingInApp/Gist/Managers/MessageManager.swift b/Sources/MessagingInApp/Gist/Managers/MessageManager.swift
index 589b7ab33..331221f91 100644
--- a/Sources/MessagingInApp/Gist/Managers/MessageManager.swift
+++ b/Sources/MessagingInApp/Gist/Managers/MessageManager.swift
@@ -2,40 +2,51 @@ import CioInternalCommon
 import Foundation
 import UIKit
 
-public enum GistMessageActions: String {
-    case close = "gist://close"
-}
-
-class MessageManager: EngineWebDelegate {
-    private let logger: Logger
-    private let inAppMessageManager: InAppMessageManager
-    private let threadUtil: ThreadUtil
-    private let gist: GistProvider
-
-    private let currentMessage: Message
-    private var currentRoute: String
-    private let isMessageEmbed: Bool
-
-    @Atomic private var isMessageLoaded: Bool = false
-    private var inAppMessageStoreSubscriber: InAppMessageStoreSubscriber?
-    private var elapsedTimer = ElapsedTimer()
-    private var modalViewManager: ModalViewManager?
-    private var engine: EngineWebInstance!
-    private var gistView: GistView!
-    private let engineWebProvider: EngineWebProvider
-
-    init(state: InAppMessageState, message: Message) {
+/// Abstract base class that contains shared logic for both Modal and Inline message managers.
+open class BaseMessageManager {
+    // MARK: - Dependencies
+
+    let logger: Logger
+    let inAppMessageManager: InAppMessageManager
+    let threadUtil: ThreadUtil
+    let gist: GistProvider
+    let engineWebProvider: EngineWebProvider
+
+    // MARK: - Message & State
+
+    let currentMessage: Message
+    var currentRoute: String
+    let isMessageEmbed: Bool
+
+    @Atomic var isMessageLoaded: Bool = false
+    var elapsedTimer = ElapsedTimer()
+    var engine: EngineWebInstance!
+    var gistView: GistView!
+    var deeplinkUtil: DeepLinkUtil
+
+    // MARK: - Initializers
+
+    /**
+     Designated initializer where you inject all dependencies.
+     Useful for testing (you can pass mock dependencies).
+     */
+    init(
+        state: InAppMessageState,
+        message: Message
+    ) {
         self.currentMessage = message
         self.currentRoute = message.messageId
         self.isMessageEmbed = !(message.gistProperties.elementId?.isBlankOrEmpty() ?? true)
 
         let diGraph = DIGraphShared.shared
-        self.logger = diGraph.logger
         self.inAppMessageManager = diGraph.inAppMessageManager
         self.threadUtil = diGraph.threadUtil
         self.gist = diGraph.gistProvider
         self.engineWebProvider = diGraph.engineWebProvider
+        self.logger = diGraph.logger
+        self.deeplinkUtil = diGraph.deepLinkUtil
 
+        // Create engine
         let engineWebConfiguration = EngineWebConfiguration(
             siteId: state.siteId,
             dataCenter: state.dataCenter,
@@ -44,284 +55,212 @@ class MessageManager: EngineWebDelegate {
             messageId: message.messageId,
             properties: message.properties.mapValues { AnyEncodable($0) }
         )
+        self.engine = engineWebProvider.getEngineWebInstance(
+            configuration: engineWebConfiguration,
+            state: state,
+            message: message
+        )
+        engine.delegate = nil // Will assign below
 
-        self.engine = engineWebProvider.getEngineWebInstance(configuration: engineWebConfiguration, state: state, message: message)
-        engine.delegate = self
+        // Create GistView
         self.gistView = GistView(message: currentMessage, engineView: engine.view)
 
-        subscribeToInAppMessageState()
+        // Set delegate and subscribe
+        engine.delegate = self
     }
 
     deinit {
-        unsubscribeFromInAppMessageState()
         removeEngineWebView()
     }
 
-    func subscribeToInAppMessageState() {
-        // Keep a strong reference to the subscriber to prevent deallocation and continue receiving updates
-        // Also, since we do not store strong reference of MessageManager anywhere, not keeping a strong reference of
-        // subscriber may result in deallocation of MessageManager and hence dismissal of message unexpectedly.
-        inAppMessageStoreSubscriber = {
-            let subscriber = InAppMessageStoreSubscriber { [self] state in
-                let messageState = state.currentMessageState
-                switch messageState {
-                case .displayed:
-                    threadUtil.runMain {
-                        self.loadModalMessage()
-                    }
-
-                // Dismiss the message when the message is dismissed or initial state
-                // Initial state may only be received when state is reset while a message was being displayed
-                case .dismissed, .initial:
-                    threadUtil.runMain {
-                        // Unsubscribe from InAppMessageState when the message is dismissed completely
-                        // so that MessageManager is deallocated only after dismiss animation is completed.
-                        self.dismissMessage {
-                            self.removeEngineWebView()
-                            self.unsubscribeFromInAppMessageState()
-                            // Fetch user messages from local store after message is dismissed so that
-                            // next message can be displayed instantly if available.
-                            // This is only needed when message is dismissed and not when it is reset.
-                            if case .dismissed = messageState {
-                                self.gist.fetchUserMessagesFromRemoteQueue()
-                            }
-                        }
-                    }
-
-                default:
-                    break
-                }
-            }
-            inAppMessageManager.subscribe(keyPath: \.currentMessageState, subscriber: subscriber)
-            return subscriber
-        }()
-    }
-
-    /// Unsubscribes from InAppMessageState so that MessageManager can be deallocated.
-    func unsubscribeFromInAppMessageState() {
-        guard let subscriber = inAppMessageStoreSubscriber else { return }
-
-        logger.logWithModuleTag("Unsubscribing MessageManager from InAppMessageState", level: .debug)
-        inAppMessageManager.unsubscribe(subscriber: subscriber)
-        inAppMessageStoreSubscriber = nil
-    }
+    // MARK: - Engine Cleanup
 
-    /// Removes EngineWebView from MessageManager and sets the delegate to nil to stop receiving JS events.
-    func removeEngineWebView() {
-        // If delegate is nil, then EngineWebView is already cleaned up.
-        guard let _ = engine.delegate else { return }
-
-        logger.logWithModuleTag("Cleaning EngineWebView from MessageManager", level: .debug)
+    open func removeEngineWebView() {
+        guard engine.delegate != nil else { return }
+        logger.logWithModuleTag("Cleaning EngineWebView from BaseMessageManager", level: .debug)
         engine.cleanEngineWeb()
         engine.delegate = nil
     }
 
-    func showMessage() {
-        elapsedTimer.start(title: "Displaying modal for message: \(currentMessage.messageId)")
-    }
-
-    private func loadModalMessage() {
-        guard isMessageLoaded else {
-            logger.logWithModuleTag("Message already loaded. Skipping loading modal message: \(currentMessage.describeForLogs)", level: .debug)
-            return
-        }
+    // MARK: - Helpers
 
-        let gistProperties = currentMessage.gistProperties
-        logger.logWithModuleTag("Loading modal message: \(currentMessage.describeForLogs)", level: .debug)
-        modalViewManager = ModalViewManager(gistView: gistView, position: gistProperties.position, overlayColor: gistProperties.overlayColor)
-        modalViewManager?.showModalView { [weak self] in
-            guard let self = self else { return }
+    public func showNewMessage(url: URL) {
+        logger.logWithModuleTag("Showing new message from action: \(url.absoluteString)", level: .info)
+        var properties: [String: Any]?
 
-            self.elapsedTimer.end()
+        if let stringProps = url.queryParameters?["properties"],
+           let decodedData = Data(base64Encoded: stringProps),
+           let decodedString = String(data: decodedData, encoding: .utf8),
+           let convertedProps = convertToDictionary(text: decodedString) {
+            properties = convertedProps
         }
-    }
 
-    private func dismissMessage(completionHandler: (() -> Void)? = nil) {
-        logger.logWithModuleTag("Dismissing message: \(currentMessage.describeForLogs) from MessageManager", level: .debug)
-        // If modalViewManager is nil, skip dismissing the message but call completion handler so rest of the resources can be cleaned up.
-        guard let modalViewManager = modalViewManager else {
-            completionHandler?()
-            return
+        if let messageId = url.queryParameters?["messageId"] {
+            let message = Message(messageId: messageId, properties: properties)
+            inAppMessageManager.dispatch(action: .loadMessage(message: message))
         }
-        // Dismiss modal view and call the completion handler when modal view is dismissed.
-        modalViewManager.dismissModalView { [weak self] in
-            guard let _ = self else { return }
+    }
 
-            completionHandler?()
+    public func convertToDictionary(text: String) -> [String: Any]? {
+        if let data = text.data(using: .utf8) {
+            do {
+                return try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any]
+            } catch {
+                print(error.localizedDescription)
+            }
         }
+        return nil
     }
+}
 
-    func bootstrapped() {
-        logger.logWithModuleTag("Bourbon Engine bootstrapped", level: .debug)
+// MARK: - EngineWebDelegate Conformance
 
-        // Cleaning after engine web is bootstrapped and all assets downloaded.
-        if currentMessage.messageId == "" {
+extension BaseMessageManager: EngineWebDelegate {
+    public func bootstrapped() {
+        logger.logWithModuleTag("Bourbon Engine bootstrapped", level: .debug)
+        // If empty message ID, clean engine
+        if currentMessage.messageId.isEmpty {
             engine.cleanEngineWeb()
         }
     }
 
-    // swiftlint:disable cyclomatic_complexity
-    func tap(name: String, action: String, system: Bool) {
+    public func tap(name: String, action: String, system: Bool) {
         logger.logWithModuleTag("Action triggered: \(action) with name: \(name)", level: .info)
-        inAppMessageManager.dispatch(action: .engineAction(action: .tap(message: currentMessage, route: currentRoute, name: name, action: action)))
-        gistView.delegate?.action(message: currentMessage, currentRoute: currentRoute, action: action, name: name)
-
-        if let url = URL(string: action), url.scheme == "gist" {
-            switch url.host {
-            case "close":
-                logger.logWithModuleTag("Dismissing from action: \(action)", level: .info)
-                inAppMessageManager.dispatch(action: .dismissMessage(message: currentMessage, viaCloseAction: true))
-            case "loadPage":
-                // Encode '#' in url action string and creates encoded URL to handle fragments
-                let encodedUrl = URL(string: action.percentEncode(character: "#")) ?? url
-                if let page = encodedUrl.queryParameters?["url"],
-                   let pageUrl = URL(string: page),
-                   UIApplication.shared.canOpenURL(pageUrl) {
-                    UIApplication.shared.open(pageUrl)
-                }
-            case "showMessage":
-                if currentMessage.isEmbedded {
-                    showNewMessage(url: url)
-                } else {
-                    inAppMessageManager.dispatch(action: .dismissMessage(message: currentMessage, shouldLog: false))
-                    showNewMessage(url: url)
-                }
-            default: break
-            }
-        } else {
-            if system {
-                inAppMessageManager.dispatch(action: .dismissMessage(message: currentMessage, shouldLog: false))
-                if let url = URL(string: action), UIApplication.shared.canOpenURL(url) {
-                    /*
-                     There are 2 types of deep links:
-                     1. Universal Links which give URL format of a webpage using `http://` or `https://`
-                     2. App scheme which give URL format using a prototol other then `http://` or `https://`.
-
-                     First, try to open the link inside of the host app. This is to keep compatability with Universal Links.
-                     Learn more of edge case: https://github.com/customerio/customerio-ios/issues/262
-
-                     Fallback to opening the URL through a sytem call if:
-                     1. deep link is an app scheme URL
-                     2. Customer has not implemented the correct function in their host app to handle universal link:
-                     ```
-                     func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool
-                     ```
-                     3. Customer returned `false` from ^^^ function.
-                     */
-                    let handledByUserActivity = continueNSUserActivity(webpageURL: url)
-
-                    if !handledByUserActivity {
-                        // If `continueNSUserActivity` could not handle the URL, try opening it directly.
-                        UIApplication.shared.open(url) { handled in
-                            if handled {
-                                self.logger.logWithModuleTag("Dismissing from system action: \(action)", level: .info)
-                            } else {
-                                self.logger.logWithModuleTag("System action not handled", level: .info)
-                            }
-                        }
-                    } else {
-                        logger.logWithModuleTag("Handled by NSUserActivity", level: .info)
-                    }
-                }
-            }
-        }
-    }
 
-    // swiftlint:enable cyclomatic_complexity
+        // 1) Dispatch engine tap event
+        inAppMessageManager.dispatch(
+            action: .engineAction(
+                action: .tap(
+                    message: currentMessage,
+                    route: currentRoute,
+                    name: name,
+                    action: action
+                )
+            )
+        )
+        // 2) Notify gistView
+        gistView.delegate?.action(
+            message: currentMessage,
+            currentRoute: currentRoute,
+            action: action,
+            name: name
+        )
 
-    // Check if
-    func continueNSUserActivity(webpageURL: URL) -> Bool {
-        guard #available(iOS 10.0, *) else {
-            return false
-        }
-        guard isLinkValidNSUserActivityLink(webpageURL) else {
-            return false
+        // 3) Gist-based or other?
+        guard let url = URL(string: action), url.scheme == "gist" else {
+            // Non-gist actions (deep links, system actions, etc.)
+            handleNonGistAction(action, system: system)
+            return
         }
 
-        let openLinkInHostAppActivity = NSUserActivity(activityType: NSUserActivityTypeBrowsingWeb)
-        openLinkInHostAppActivity.webpageURL = webpageURL
-
-        let didHostAppHandleLink = UIApplication.shared.delegate?.application?(UIApplication.shared, continue: openLinkInHostAppActivity, restorationHandler: { _ in }) ?? false
+        // 4) Switch on gist action
+        switch url.host {
+        case "close":
+            handleGistCloseAction(action: action)
+        case "loadPage":
+            handleGistLoadPageAction(url: url, originalAction: action)
+        case "showMessage":
+            handleGistShowMessageAction(url: url)
+        default:
+            break
+        }
+    }
 
-        return didHostAppHandleLink
+    private func handleGistCloseAction(action: String) {
+        logger.logWithModuleTag("Dismissing from action: \(action)", level: .info)
+        inAppMessageManager.dispatch(
+            action: .dismissMessage(
+                message: currentMessage,
+                viaCloseAction: true
+            )
+        )
     }
 
-    // The NSUserActivity.webpageURL property permits only specific URL schemes. This function exists to validate the scheme and prevent potential exceptions due to incompatible URL formats.
-    func isLinkValidNSUserActivityLink(_ url: URL) -> Bool {
-        guard let schemeOfUrl = url.scheme else {
-            return false
+    private func handleGistLoadPageAction(url: URL, originalAction: String) {
+        // Encode '#' in url action string and creates encoded URL to handle fragments
+        let encodedUrl = URL(string: originalAction.percentEncode(character: "#")) ?? url
+        if let page = encodedUrl.queryParameters?["url"],
+           let pageUrl = URL(string: page),
+           UIApplication.shared.canOpenURL(pageUrl) {
+            UIApplication.shared.open(pageUrl)
         }
+    }
 
-        // Constants to hold allowed URL schemes
-        let allowedSchemes = ["http", "https"]
+    private func handleGistShowMessageAction(url: URL) {
+        if currentMessage.isEmbedded {
+            showNewMessage(url: url)
+        } else {
+            inAppMessageManager.dispatch(
+                action: .dismissMessage(
+                    message: currentMessage,
+                    shouldLog: false
+                )
+            )
+            showNewMessage(url: url)
+        }
+    }
 
-        return allowedSchemes.contains(schemeOfUrl)
+    private func handleNonGistAction(_ action: String, system: Bool) {
+        if system {
+            inAppMessageManager.dispatch(
+                action: .dismissMessage(
+                    message: currentMessage,
+                    shouldLog: false
+                )
+            )
+            if let url = URL(string: action) {
+                deeplinkUtil.handleDeepLink(url)
+            }
+        }
     }
 
-    func routeChanged(newRoute: String) {
+    public func routeChanged(newRoute: String) {
         logger.info("Message route changed to: \(newRoute)")
     }
 
-    func sizeChanged(width: CGFloat, height: CGFloat) {
+    public func sizeChanged(width: CGFloat, height: CGFloat) {
         gistView.delegate?.sizeChanged(message: currentMessage, width: width, height: height)
         logger.logWithModuleTag("Message size changed Width: \(width) - Height: \(height)", level: .debug)
     }
 
-    func routeError(route: String) {
+    public func routeError(route: String) {
         logger.logWithModuleTag("Error loading message with route: \(route)", level: .error)
-        inAppMessageManager.dispatch(action: .engineAction(action: .messageLoadingFailed(message: currentMessage)))
+        inAppMessageManager.dispatch(
+            action: .engineAction(
+                action: .messageLoadingFailed(message: currentMessage)
+            )
+        )
     }
 
-    func error() {
+    public func error() {
         logger.logWithModuleTag("Error loading message with id: \(currentMessage.describeForLogs)", level: .error)
-        inAppMessageManager.dispatch(action: .engineAction(action: .messageLoadingFailed(message: currentMessage)))
+        inAppMessageManager.dispatch(
+            action: .engineAction(
+                action: .messageLoadingFailed(message: currentMessage)
+            )
+        )
     }
 
-    func routeLoaded(route: String) {
+    public func routeLoaded(route: String) {
         logger.logWithModuleTag("Message loaded with route: \(route)", level: .info)
-
         currentRoute = route
-        // If the route is the same as the current message and the message is not already loaded,
-        // then display the message.
+
+        // Only mark the message as loaded once
         if route == currentMessage.messageId, !isMessageLoaded {
             isMessageLoaded = true
             if isMessageEmbed {
                 inAppMessageManager.dispatch(action: .displayMessage(message: currentMessage))
+            } else if UIApplication.shared.applicationState == .active {
+                inAppMessageManager.dispatch(action: .displayMessage(message: currentMessage))
             } else {
-                if UIApplication.shared.applicationState == .active {
-                    inAppMessageManager.dispatch(action: .displayMessage(message: currentMessage))
-                } else {
-                    inAppMessageManager.dispatch(action: .dismissMessage(message: currentMessage, shouldLog: false, viaCloseAction: false))
-                }
+                inAppMessageManager.dispatch(
+                    action: .dismissMessage(
+                        message: currentMessage,
+                        shouldLog: false,
+                        viaCloseAction: false
+                    )
+                )
             }
         }
     }
-
-    private func showNewMessage(url: URL) {
-        logger.logWithModuleTag("Showing new message from action: \(url.absoluteString)", level: .info)
-        var properties: [String: Any]?
-
-        if let stringProps = url.queryParameters?["properties"],
-           let decodedData = Data(base64Encoded: stringProps),
-           let decodedString = String(data: decodedData, encoding: .utf8),
-           let convertedProps = convertToDictionary(text: decodedString) {
-            properties = convertedProps
-        }
-
-        if let messageId = url.queryParameters?["messageId"] {
-            let message = Message(messageId: messageId, properties: properties)
-            inAppMessageManager.dispatch(action: .loadMessage(message: message))
-        }
-    }
-
-    private func convertToDictionary(text: String) -> [String: Any]? {
-        if let data = text.data(using: .utf8) {
-            do {
-                return try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any]
-            } catch {
-                print(error.localizedDescription)
-            }
-        }
-        return nil
-    }
 }
diff --git a/Sources/MessagingInApp/Gist/Managers/ModalMessageManager.swift b/Sources/MessagingInApp/Gist/Managers/ModalMessageManager.swift
new file mode 100644
index 000000000..692b5995b
--- /dev/null
+++ b/Sources/MessagingInApp/Gist/Managers/ModalMessageManager.swift
@@ -0,0 +1,118 @@
+import Foundation
+import UIKit
+
+/// A MessageManager subclass that specifically shows messages in a modal view.
+public class ModalMessageManager: BaseMessageManager {
+    private var modalViewManager: ModalViewManager?
+    var inAppMessageStoreSubscriber: InAppMessageStoreSubscriber?
+    override init(state: InAppMessageState, message: Message) {
+        super.init(state: state, message: message)
+        subscribeToInAppMessageState()
+    }
+
+    deinit {
+        unsubscribeFromInAppMessageState()
+    }
+
+    // MARK: - Subscription to InAppMessageState
+
+    public func subscribeToInAppMessageState() {
+        inAppMessageStoreSubscriber = {
+            let subscriber = InAppMessageStoreSubscriber { [self] state in
+                let messageState = state.modalMessageState
+                switch messageState {
+                case .displayed:
+                    threadUtil.runMain {
+                        // Subclasses (Modal or Inline) can show differently
+                        self.onMessageDisplayed()
+                    }
+                case .dismissed, .initial:
+                    threadUtil.runMain {
+                        // Dismiss the message from subclass
+                        self.onMessageDismissed(messageState: messageState)
+                    }
+                default:
+                    break
+                }
+            }
+            self.inAppMessageManager.subscribe(keyPath: \.modalMessageState, subscriber: subscriber)
+            return subscriber
+        }()
+    }
+
+    // Show the modal when the message is displayed
+    func onMessageDisplayed() {
+        guard isMessageLoaded else {
+            logger.logWithModuleTag(
+                "Message not loaded yet. Skipping loadModalMessage for \(currentMessage.describeForLogs).",
+                level: .debug
+            )
+            return
+        }
+
+        logger.logWithModuleTag(
+            "Displaying modal message: \(currentMessage.describeForLogs)",
+            level: .debug
+        )
+
+        let gistProperties = currentMessage.gistProperties
+        modalViewManager = ModalViewManager(
+            gistView: gistView,
+            position: gistProperties.position,
+            overlayColor: gistProperties.overlayColor
+        )
+        // Show the modal with an optional completion
+        modalViewManager?.showModalView { [weak self] in
+            self?.elapsedTimer.end()
+        }
+    }
+
+    // Called when the message is dismissed (or reset).
+    // Because onMessageDismissed(...) is internal in BaseMessageManager,
+    // we can override it here in the same module.
+    func onMessageDismissed(messageState: ModalMessageState) {
+        logger.logWithModuleTag(
+            "Dismissing message: \(currentMessage.describeForLogs) from ModalMessageManager",
+            level: .debug
+        )
+
+        // Common handler to finalize dismissal logic
+        let dismissalHandler: () -> Void = { [weak self] in
+            self?.finishDismissal(messageState: messageState)
+        }
+
+        guard let modalViewManager = modalViewManager else {
+            // No modal to dismiss
+            dismissalHandler()
+            return
+        }
+        // Dismiss the modal then call completion
+        modalViewManager.dismissModalView(completionHandler: dismissalHandler)
+    }
+
+    open func unsubscribeFromInAppMessageState() {
+        guard let subscriber = inAppMessageStoreSubscriber else { return }
+        logger.logWithModuleTag("Unsubscribing BaseMessageManager from InAppMessageState", level: .debug)
+        inAppMessageManager.unsubscribe(subscriber: subscriber)
+        inAppMessageStoreSubscriber = nil
+    }
+
+    private func finishDismissal(messageState: ModalMessageState) {
+        removeEngineWebView()
+        unsubscribeFromInAppMessageState()
+
+        // If the message was explicitly dismissed (not just reset to initial)
+        // then fetch next messages from queue
+        if case .dismissed = messageState {
+            gist.fetchUserMessagesFromRemoteQueue()
+        }
+    }
+
+    /// Optional public method to kick off modal display timing or logs.
+    /// (Used in some flows to explicitly measure "show time".)
+    public func showMessage() {
+        elapsedTimer.start(
+            title: "Displaying modal for message: \(currentMessage.messageId)"
+        )
+    }
+}
diff --git a/Sources/MessagingInApp/Gist/Managers/Models/Message.swift b/Sources/MessagingInApp/Gist/Managers/Models/Message.swift
index efed1c2c2..8fa60ddc6 100644
--- a/Sources/MessagingInApp/Gist/Managers/Models/Message.swift
+++ b/Sources/MessagingInApp/Gist/Managers/Models/Message.swift
@@ -38,6 +38,10 @@ public class Message {
         gistProperties.elementId != nil
     }
 
+    public var elementId: String? {
+        gistProperties.elementId
+    }
+
     public init(
         messageId: String,
         queueId: String? = nil,
@@ -114,6 +118,14 @@ extension Message {
 
         return true
     }
+
+    func messageMatchesRoute(_ currentRoute: String?) -> Bool {
+        if doesHavePageRule() {
+            guard let currentRoute else { return false }
+            return doesPageRuleMatch(route: currentRoute)
+        }
+        return true
+    }
 }
 
 extension Message: Equatable, Hashable {
diff --git a/Sources/MessagingInApp/Gist/Views/GistView.swift b/Sources/MessagingInApp/Gist/Views/GistView.swift
index 422328a29..4b7ab2c99 100644
--- a/Sources/MessagingInApp/Gist/Views/GistView.swift
+++ b/Sources/MessagingInApp/Gist/Views/GistView.swift
@@ -9,7 +9,7 @@ public protocol GistViewDelegate: AnyObject {
 
 public class GistView: UIView {
     public weak var delegate: GistViewDelegate?
-    private var message: Message?
+    var message: Message?
 
     convenience init(message: Message, engineView: UIView) {
         self.init()
diff --git a/Sources/MessagingInApp/State/InAppMessageAction.swift b/Sources/MessagingInApp/State/InAppMessageAction.swift
index 801fa7f35..c24408075 100644
--- a/Sources/MessagingInApp/State/InAppMessageAction.swift
+++ b/Sources/MessagingInApp/State/InAppMessageAction.swift
@@ -10,7 +10,7 @@ enum InAppMessageAction: Equatable {
     case processMessageQueue(messages: [Message])
     case clearMessageQueue
     case loadMessage(message: Message)
-    case embedMessage(message: Message, elementId: String)
+    case embedMessages(messages: [Message])
     case displayMessage(message: Message)
     case dismissMessage(message: Message, shouldLog: Bool = true, viaCloseAction: Bool = true)
     case reportError(message: String)
@@ -48,8 +48,8 @@ enum InAppMessageAction: Equatable {
         case (.loadMessage(let lhsMessage), .loadMessage(let rhsMessage)):
             return lhsMessage == rhsMessage
 
-        case (.embedMessage(let lhsMessage, let lhsElementId), .embedMessage(let rhsMessage, let rhsElementId)):
-            return lhsMessage == rhsMessage && lhsElementId == rhsElementId
+        case (.embedMessages(let lhsMessages), .embedMessages(let rhsMessages)):
+            return lhsMessages == rhsMessages
 
         case (.displayMessage(let lhsMessage), .displayMessage(let rhsMessage)):
             return lhsMessage == rhsMessage
diff --git a/Sources/MessagingInApp/State/InAppMessageMiddleware.swift b/Sources/MessagingInApp/State/InAppMessageMiddleware.swift
index d691a9455..2e715948d 100644
--- a/Sources/MessagingInApp/State/InAppMessageMiddleware.swift
+++ b/Sources/MessagingInApp/State/InAppMessageMiddleware.swift
@@ -58,7 +58,7 @@ func routeMatchingMiddleware(logger: Logger) -> InAppMessageMiddleware {
         // Check if there is a message displayed and if it has a page rule
         // If the message does not have a page rule, it will continue to be displayed
         // If the message has a page rule, it will be dismissed only if updated route does not match message's page rule
-        if let message = state.currentMessageState.activeModalMessage,
+        if let message = state.modalMessageState.activeModalMessage,
            message.doesHavePageRule(),
            !message.doesPageRuleMatch(route: currentRoute) {
             // Dismiss message if the route does not match new route
@@ -80,15 +80,15 @@ func modalMessageDisplayStateMiddleware(logger: Logger, threadUtil: ThreadUtil)
 
         let state = getState()
         // If there is a message currently displayed, block loading new message
-        guard !state.currentMessageState.isDisplayed else {
-            let currentMessage = state.currentMessageState.message?.describeForLogs ?? "nil"
+        guard !state.modalMessageState.isDisplayed else {
+            let currentMessage = state.modalMessageState.message?.describeForLogs ?? "nil"
             return next(.reportError(message: "Blocked loading message: \(message.describeForLogs) because another message is currently displayed or cancelled: \(currentMessage)"))
         }
 
         logger.logWithModuleTag("Showing message: \(message)", level: .debug)
         // Show message on main thread to avoid unexpected crashes
         threadUtil.runMain {
-            let messageManager = MessageManager(state: state, message: message)
+            let messageManager = ModalMessageManager(state: state, message: message)
             messageManager.showMessage()
         }
 
@@ -147,8 +147,8 @@ func messageQueueProcessorMiddleware(logger: Logger) -> InAppMessageMiddleware {
             .filter { message in
                 guard let queueId = message.queueId else { return false }
 
-                // Filter out messages that have been shown already, or if the message is embedded
-                return !state.shownMessageQueueIds.contains(queueId) && message.gistProperties.elementId == nil
+                // Filter out messages that have been shown already
+                return !state.shownMessageQueueIds.contains(queueId)
             }
             .reduce(into: [Message]()) { result, message in
                 if !result.contains(where: { $0.queueId == message.queueId }) {
@@ -157,26 +157,40 @@ func messageQueueProcessorMiddleware(logger: Logger) -> InAppMessageMiddleware {
             }
             .sorted { ($0.priority ?? Int.max) < ($1.priority ?? Int.max) }
 
-        // Find the first message that matches the current route or has no page rule
-        // Since messages are sorted by priority, the first message will be the one with the highest priority
-        let messageToBeShown = notShownMessages.first { message in
-            let currentRoute = state.currentRoute
+        // Split into modal and embedded messages
+        let modalMessages = notShownMessages.filter { !$0.isEmbedded }
+        let embeddedMessages = notShownMessages.filter(\.isEmbedded)
 
-            if message.doesHavePageRule() {
-                guard let currentRoute else { return false }
+        let isCurrentMessageLoading = state.modalMessageState.isLoading
+        let isCurrentMessageDisplaying = state.modalMessageState.isDisplayed
+        // Dispatch next action to process remaining messages
+        next(.processMessageQueue(messages: notShownMessages))
 
-                return message.doesPageRuleMatch(route: currentRoute)
+        // Handle embedded messages
+        let embedMessagesToBeShown = embeddedMessages
+            .filter { $0.messageMatchesRoute(state.currentRoute) }
+            .filter { message in
+                // Ensure no duplicate embedded messages for the same elementId in the `.embedded` state
+                guard let elementId = message.elementId else { return true }
+                if let existingState = state.embeddedMessagesState.getMessage(forElementId: elementId),
+                   case .embedded = existingState {
+                    return false // Exclude if the existing state is `.embedded`
+                }
+                return true // Include if no `.embedded` message exists for this elementId
             }
-            return true
+
+        if !embedMessagesToBeShown.isEmpty {
+            dispatch(.embedMessages(messages: embedMessagesToBeShown))
         }
 
-        let isCurrentMessageLoading = state.currentMessageState.isLoading
-        let isCurrentMessageDisplaying = state.currentMessageState.isDisplayed
-        // Dispatch next action to process remaining messages
-        next(.processMessageQueue(messages: notShownMessages))
+        // Find the first message that matches the current route or has no page rule
+        // Since messages are sorted by priority, the first message will be the one with the highest priority
+        let modelMessageToBeShown = modalMessages.first { message in
+            message.messageMatchesRoute(state.currentRoute)
+        }
 
         // If there is a message currently displayed or loading, do not show another message
-        guard let message = messageToBeShown,
+        guard let message = modelMessageToBeShown,
               !isCurrentMessageLoading,
               !isCurrentMessageDisplaying
         else {
@@ -198,9 +212,6 @@ func messageEventCallbacksMiddleware(delegate: GistDelegate) -> InAppMessageMidd
         // Forward message events to delegate when message is displayed, dismissed or embedded,
         // or when an engine action is received
         switch action {
-        case .embedMessage(let message, let elementId):
-            delegate.embedMessage(message: message, elementId: elementId)
-
         case .displayMessage(let message):
             delegate.messageShown(message: message)
 
diff --git a/Sources/MessagingInApp/State/InAppMessageReducer.swift b/Sources/MessagingInApp/State/InAppMessageReducer.swift
index 9474332d6..976e40d26 100644
--- a/Sources/MessagingInApp/State/InAppMessageReducer.swift
+++ b/Sources/MessagingInApp/State/InAppMessageReducer.swift
@@ -41,36 +41,66 @@ private func reducer(action: InAppMessageAction, state: InAppMessageState) -> In
     case .processMessageQueue(let messages):
         return state.copy(messagesInQueue: Set(messages))
 
+    case .embedMessages(let messages):
+        var newEmbeddedMessages = state.embeddedMessagesState
+        for message in messages {
+            if let elementId = message.elementId {
+                newEmbeddedMessages.add(message: message, elementId: elementId)
+            }
+        }
+        return state.copy(embeddedMessagesState: newEmbeddedMessages)
+
     case .clearMessageQueue:
         return state.copy(messagesInQueue: [])
 
     case .loadMessage(let message):
-        return state.copy(currentMessageState: .loading(message: message))
+        return state.copy(modalMessageState: .loading(message: message))
 
     case .displayMessage(let message):
-        if let queueId = message.queueId {
-            // If the message should be tracked shown when it is displayed, add the queueId to shownMessageQueueIds.
-            let shownMessageQueueIds = action.shouldMarkMessageAsShown
-                ? state.shownMessageQueueIds.union([queueId])
-                : state.shownMessageQueueIds
-
-            return state.copy(
-                currentMessageState: .displayed(message: message),
-                messagesInQueue: state.messagesInQueue.filter { $0.queueId != queueId },
-                shownMessageQueueIds: shownMessageQueueIds
+        guard let queueId = message.queueId else { return state }
+
+        // Update shownMessageQueueIds if the message should be tracked
+        let shownMessageQueueIds = action.shouldMarkMessageAsShown
+            ? state.shownMessageQueueIds.union([queueId])
+            : state.shownMessageQueueIds
+
+        // Remove the message from the queue
+        let messagesInQueue = state.messagesInQueue.filter { $0.queueId != queueId }
+
+        if message.isEmbedded {
+            // Update embedded message state
+            return state.updateEmbeddedMessage(
+                queueId: queueId,
+                newState: .embedded(message: message, elementId: message.elementId ?? ""),
+                shownMessageQueueIds: shownMessageQueueIds,
+                messagesInQueue: messagesInQueue
             )
         }
-        return state
+
+        // Update modal message state
+        return state.copy(
+            modalMessageState: .displayed(message: message),
+            messagesInQueue: messagesInQueue,
+            shownMessageQueueIds: shownMessageQueueIds
+        )
 
     case .dismissMessage(let message, _, _):
-        var shownMessageQueueIds = state.shownMessageQueueIds
-        // If the message should be tracked shown when it is dismissed, add the queueId to shownMessageQueueIds.
-        if action.shouldMarkMessageAsShown, let queueId = message.queueId {
-            shownMessageQueueIds = shownMessageQueueIds.union([queueId])
+        let shownMessageQueueIds = action.shouldMarkMessageAsShown && message.queueId != nil
+            ? state.shownMessageQueueIds.union([message.queueId!])
+            : state.shownMessageQueueIds
+
+        if message.isEmbedded, let queueId = message.queueId {
+            // Update embedded message state
+            return state.updateEmbeddedMessage(
+                queueId: queueId,
+                newState: InlineMessageState.dismissed(message: message),
+                shownMessageQueueIds: shownMessageQueueIds
+            )
         }
 
+        // Update modal message state
         return state.copy(
-            currentMessageState: .dismissed(message: message),
+            modalMessageState: .dismissed(message: message),
             shownMessageQueueIds: shownMessageQueueIds
         )
 
@@ -79,11 +109,10 @@ private func reducer(action: InAppMessageAction, state: InAppMessageState) -> In
         case .tap:
             return state
         case .messageLoadingFailed(let message):
-            return state.copy(currentMessageState: .dismissed(message: message))
+            return state.copy(modalMessageState: .dismissed(message: message))
         }
 
-    case .embedMessage,
-         .reportError:
+    case .reportError:
         return state
 
     case .resetState:
diff --git a/Sources/MessagingInApp/State/InAppMessageState.swift b/Sources/MessagingInApp/State/InAppMessageState.swift
index 5ff841146..0b36917ed 100644
--- a/Sources/MessagingInApp/State/InAppMessageState.swift
+++ b/Sources/MessagingInApp/State/InAppMessageState.swift
@@ -11,7 +11,8 @@ struct InAppMessageState: Equatable, CustomStringConvertible {
     let pollInterval: Double
     let userId: String?
     let currentRoute: String?
-    let currentMessageState: MessageState
+    let modalMessageState: ModalMessageState
+    let embeddedMessagesState: EmbeddedMessagesState
     let messagesInQueue: Set<Message>
     let shownMessageQueueIds: Set<String>
 
@@ -22,7 +23,8 @@ struct InAppMessageState: Equatable, CustomStringConvertible {
         pollInterval: Double = 600,
         userId: String? = nil,
         currentRoute: String? = nil,
-        currentMessageState: MessageState = .initial,
+        modalMessageState: ModalMessageState = .initial,
+        embeddedMessagesState: EmbeddedMessagesState = EmbeddedMessagesState(),
         messagesInQueue: Set<Message> = [],
         shownMessageQueueIds: Set<String> = []
     ) {
@@ -32,7 +34,8 @@ struct InAppMessageState: Equatable, CustomStringConvertible {
         self.pollInterval = pollInterval
         self.userId = userId
         self.currentRoute = currentRoute
-        self.currentMessageState = currentMessageState
+        self.modalMessageState = modalMessageState
+        self.embeddedMessagesState = embeddedMessagesState
         self.messagesInQueue = messagesInQueue
         self.shownMessageQueueIds = shownMessageQueueIds
     }
@@ -43,7 +46,8 @@ struct InAppMessageState: Equatable, CustomStringConvertible {
         pollInterval: Double? = nil,
         userId: String? = nil,
         currentRoute: String? = nil,
-        currentMessageState: MessageState? = nil,
+        modalMessageState: ModalMessageState? = nil,
+        embeddedMessagesState: EmbeddedMessagesState? = nil,
         messagesInQueue: Set<Message>? = nil,
         shownMessageQueueIds: Set<String>? = nil
     ) -> InAppMessageState {
@@ -54,7 +58,8 @@ struct InAppMessageState: Equatable, CustomStringConvertible {
             pollInterval: pollInterval ?? self.pollInterval,
             userId: userId ?? self.userId,
             currentRoute: currentRoute ?? self.currentRoute,
-            currentMessageState: currentMessageState ?? self.currentMessageState,
+            modalMessageState: modalMessageState ?? self.modalMessageState,
+            embeddedMessagesState: embeddedMessagesState ?? self.embeddedMessagesState,
             messagesInQueue: messagesInQueue ?? self.messagesInQueue,
             shownMessageQueueIds: shownMessageQueueIds ?? self.shownMessageQueueIds
         )
@@ -67,7 +72,7 @@ struct InAppMessageState: Equatable, CustomStringConvertible {
             lhs.pollInterval == rhs.pollInterval &&
             lhs.userId == rhs.userId &&
             lhs.currentRoute == rhs.currentRoute &&
-            lhs.currentMessageState == rhs.currentMessageState &&
+            lhs.modalMessageState == rhs.modalMessageState &&
             lhs.messagesInQueue == rhs.messagesInQueue &&
             lhs.shownMessageQueueIds == rhs.shownMessageQueueIds
     }
@@ -81,7 +86,8 @@ struct InAppMessageState: Equatable, CustomStringConvertible {
             pollInterval: \(pollInterval),
             userId: \(String(describing: userId)),
             currentRoute: \(String(describing: currentRoute)),
-            currentMessageState: \(currentMessageState),
+            modalMessageState: \(modalMessageState),
+            embeddedMessagesState: \(embeddedMessagesState),
             messagesInQueue: \(messagesInQueue.map(\.describeForLogs)),
             shownMessageQueueIds: \(shownMessageQueueIds)
         )
@@ -110,24 +116,40 @@ extension InAppMessageState {
         putIfDifferent(\.pollInterval, as: "pollInterval")
         putIfDifferent(\.userId, as: "userId")
         putIfDifferent(\.currentRoute, as: "currentRoute")
-        putIfDifferent(\.currentMessageState, as: "currentMessageState")
+        putIfDifferent(\.modalMessageState, as: "currentMessageState")
+        putIfDifferent(\.embeddedMessagesState, as: "embeddedMessagesState")
         putIfDifferent(\.messagesInQueue, as: "messagesInQueue")
         putIfDifferent(\.shownMessageQueueIds, as: "shownMessageQueueIds")
 
         return diffs
     }
+
+    func updateEmbeddedMessage(
+        queueId: String,
+        newState: InlineMessageState,
+        shownMessageQueueIds: Set<String>,
+        messagesInQueue: Set<Message>? = nil
+    ) -> InAppMessageState {
+        var updatedEmbeddedMessages = embeddedMessagesState
+        updatedEmbeddedMessages.updateState(forQueueId: queueId, to: newState)
+
+        return copy(
+            embeddedMessagesState: updatedEmbeddedMessages,
+            messagesInQueue: messagesInQueue ?? self.messagesInQueue,
+            shownMessageQueueIds: shownMessageQueueIds
+        )
+    }
 }
 
 /// Represents various states an in-app message can be in.
 /// The states are derived from lifecycle of an in-app message, from loading to displaying to dismissing.
-enum MessageState: Equatable, CustomStringConvertible {
+enum ModalMessageState: Equatable, CustomStringConvertible {
     case initial
     case loading(message: Message)
     case displayed(message: Message)
-    case embedded(message: Message, elementId: String)
     case dismissed(message: Message)
 
-    static func == (lhs: MessageState, rhs: MessageState) -> Bool {
+    static func == (lhs: ModalMessageState, rhs: ModalMessageState) -> Bool {
         switch (lhs, rhs) {
         case (.initial, .initial):
             return true
@@ -135,8 +157,6 @@ enum MessageState: Equatable, CustomStringConvertible {
              (.displayed(let lhsMessage), .displayed(let rhsMessage)),
              (.dismissed(let lhsMessage), .dismissed(let rhsMessage)):
             return lhsMessage == rhsMessage
-        case (.embedded(let lhsMessage, let lhsElementId), .embedded(let rhsMessage, let rhsElementId)):
-            return lhsMessage == rhsMessage && lhsElementId == rhsElementId
         default:
             return false
         }
@@ -150,26 +170,66 @@ enum MessageState: Equatable, CustomStringConvertible {
             return "Loading(\(message.describeForLogs))"
         case .displayed(let message):
             return "Displayed(\(message.describeForLogs))"
+        case .dismissed(let message):
+            return "Dismissed(\(message.describeForLogs))"
+        }
+    }
+}
+
+/// Represents various states an in-app message can be in.
+/// The states are derived from lifecycle of an in-app message, from loading to displaying to dismissing.
+enum InlineMessageState: Equatable, CustomStringConvertible, Hashable {
+    case readyToEmbed(message: Message, elementId: String)
+    case embedded(message: Message, elementId: String)
+    case dismissed(message: Message)
+
+    static func == (lhs: InlineMessageState, rhs: InlineMessageState) -> Bool {
+        switch (lhs, rhs) {
+        case (.readyToEmbed(let lhsMessage, let lhsElementId), .readyToEmbed(let rhsMessage, let rhsElementId)):
+            return lhsMessage.queueId == rhsMessage.queueId && lhsElementId == rhsElementId
+        case (.embedded(let lhsMessage, let lhsElementId), .embedded(let rhsMessage, let rhsElementId)):
+            return lhsMessage.queueId == rhsMessage.queueId && lhsElementId == rhsElementId
+        case (.dismissed(let lhsMessage), .dismissed(let rhsMessage)):
+            return lhsMessage.queueId == rhsMessage.queueId
+        default:
+            return false
+        }
+    }
+
+    var description: String {
+        switch self {
+        case .readyToEmbed(let message, let elementId):
+            return "ReadyToEmbed(message: \(message.describeForLogs), elementId: \(elementId))"
         case .embedded(let message, _):
             return "Embedded(\(message.describeForLogs))"
         case .dismissed(let message):
             return "Dismissed(\(message.describeForLogs))"
         }
     }
+
+    func hash(into hasher: inout Hasher) {
+        switch self {
+        case .readyToEmbed(let message, let elementId):
+            hasher.combine(message.queueId)
+            hasher.combine(elementId)
+        case .embedded(let message, _),
+             .dismissed(let message):
+            hasher.combine(message.queueId)
+        }
+    }
 }
 
 /// In Swift, comparing enum cases with associated values directly can be cumbersome.
 /// This extension simplifies access to `Message` associated with each state and
 /// provides boolean properties that make it easy to check whether a `MessageState`
 /// is currently in a specific state (e.g., loading, displayed, embedded, or dismissed).
-extension MessageState {
+extension ModalMessageState {
     var message: Message? {
         switch self {
         case .initial:
             return nil
         case .loading(let message),
              .displayed(let message),
-             .embedded(let message, _),
              .dismissed(let message):
             return message
         }
@@ -179,7 +239,6 @@ extension MessageState {
     var activeModalMessage: Message? {
         switch self {
         case .initial,
-             .embedded,
              .dismissed:
             return nil
         case .loading(let message),
@@ -202,12 +261,34 @@ extension MessageState {
         return false
     }
 
-    var isEmbedded: Bool {
-        if case .embedded = self {
+    var isDismissed: Bool {
+        if case .dismissed = self {
             return true
         }
         return false
     }
+}
+
+extension InlineMessageState {
+    var message: Message? {
+        switch self {
+        case .readyToEmbed(let message, _),
+             .embedded(let message, _):
+            return message
+        case .dismissed(let message):
+            return message
+        }
+    }
+
+    var elementId: String? {
+        switch self {
+        case .readyToEmbed(_, let elementId),
+             .embedded(_, let elementId):
+            return elementId
+        case .dismissed(let message):
+            return message.elementId
+        }
+    }
 
     var isDismissed: Bool {
         if case .dismissed = self {
@@ -215,4 +296,46 @@ extension MessageState {
         }
         return false
     }
+
+    var isEmbedded: Bool {
+        if case .embedded = self {
+            return true
+        }
+        return false
+    }
+}
+
+struct EmbeddedMessagesState: Equatable {
+    private var messagesByElementId: [String: InlineMessageState] = [:] // Maps elementId -> InLineMessageState
+
+    // Add or update a message
+    mutating func add(message: Message, elementId: String) {
+        let state = InlineMessageState.readyToEmbed(message: message, elementId: elementId)
+        messagesByElementId[elementId] = state
+    }
+
+    // Fetch the current message for an elementId
+    func getMessage(forElementId elementId: String) -> InlineMessageState? {
+        messagesByElementId[elementId]
+    }
+
+    // Fetch all messages for debugging or iteration
+    func allMessages() -> [InlineMessageState] {
+        Array(messagesByElementId.values)
+    }
+
+    // Conformance to Equatable
+    static func == (lhs: EmbeddedMessagesState, rhs: EmbeddedMessagesState) -> Bool {
+        lhs.messagesByElementId == rhs.messagesByElementId
+    }
+}
+
+extension EmbeddedMessagesState {
+    // Update the state of an existing message by queueId
+    mutating func updateState(forQueueId queueId: String, to newState: InlineMessageState) {
+        guard let (elementId, _) = messagesByElementId.first(where: { $0.value.message?.queueId == queueId }) else {
+            return
+        }
+        messagesByElementId[elementId] = newState
+    }
 }
diff --git a/Sources/MessagingInApp/Type/InAppMessage.swift b/Sources/MessagingInApp/Type/InAppMessage.swift
index ae43ee9a0..798f11488 100644
--- a/Sources/MessagingInApp/Type/InAppMessage.swift
+++ b/Sources/MessagingInApp/Type/InAppMessage.swift
@@ -6,9 +6,13 @@ public struct InAppMessage: Equatable {
     public let messageId: String
     public let deliveryId: String? // (Currently taken from Gist's campaignId property). Can be nil when sending test
     // in-app messages
+    public let elementId: String? // will be null for modal messages
 
     init(gistMessage: GistMessage) {
+        // Internally, the SDK refers to the message ID as "templateId".
+        // To keep backwards compatibility, map Message.templateId to "messageId".
         self.messageId = gistMessage.messageId
         self.deliveryId = gistMessage.gistProperties.campaignId
+        self.elementId = gistMessage.elementId
     }
 }
diff --git a/Sources/MessagingInApp/Views/GistInlineInAppMessageView.swift b/Sources/MessagingInApp/Views/GistInlineInAppMessageView.swift
new file mode 100644
index 000000000..68c9ff423
--- /dev/null
+++ b/Sources/MessagingInApp/Views/GistInlineInAppMessageView.swift
@@ -0,0 +1,262 @@
+import CioInternalCommon
+import Foundation
+import UIKit
+
+// Event listener for interactions and state changes to an inline inapp message that's rendered.
+protocol GistInlineMessageUIViewDelegate: AnyObject {
+    // After a message is finished rendering and the size may have changed.
+    func onMessageRendered(width: CGFloat, height: CGFloat)
+    // If there is no longer any messages to be shown.
+    func onNoMessageToDisplay()
+    // A custom action button is pressed.
+    // @return if you handled the action yourself.
+    func onInlineButtonAction(message: Message, currentRoute: String, action: String, name: String) -> Bool
+    // If the inline View is going to show a different message. Example: When a user clicks "show another message" action buttons.
+    func willChangeMessage(newTemplateId: String, onComplete: @escaping () -> Void)
+}
+
+/**
+ UIView that can render and display an web in-app message.
+
+ Responsibilities:
+ * Given an elementId, it will get a message to display for that elementId.
+ * Dynamically change the height and width of the UIView to match aspect ratio of the in-app message
+ * Communicate events to a delegate. This allows you to customize the look of an inline message in your app!
+
+ This UIView is designed to not be opinionated on how an inline in-app message is displayed in an app. Anyone (including customers) can create a wrapper around this UIView in their UIKit or SwiftUI app and modify how in-app messages are shown.
+ */
+class GistInlineMessageUIView: UIView {
+    private var inAppMessageManager: InAppMessageManager {
+        DIGraphShared.shared.inAppMessageManager
+    }
+
+    private var logger: Logger {
+        DIGraphShared.shared.logger
+    }
+
+    var inAppMessageView: GistView? {
+        subviews.map { $0 as? GistView }.mapNonNil().first
+    }
+
+    // Can set in the constructor or can set later (like if you use Storyboards)
+    public var elementId: String? {
+        didSet {
+            refreshView()
+        }
+    }
+
+    private var contentSize: CGSize = .zero {
+        didSet {
+            // Notify the system that the intrinsic content size has changed
+            invalidateIntrinsicContentSize()
+        }
+    }
+
+    // How the View communicates the size of the in-app message that's rendered.
+    // UIKit and SwiftUI frameworks use the intrinsicContentSize to adjust auto layout constraints automaticaly to display the View correctly.
+    // Note: If you want to animate when the content size changes, create a wrapper around this View and listen to delegate events. The intrinsicContentSize instantly changes the size.
+    override public var intrinsicContentSize: CGSize {
+        contentSize
+    }
+
+    func updateContentSize(newHeight: CGFloat, newWidth: CGFloat) {
+        contentSize = .init(width: newWidth, height: newHeight)
+    }
+
+    weak var delegate: GistInlineMessageUIViewDelegate?
+
+    // When a fetch request is performed, it's an async operation to have the inline View notified about this fetch and the inline View processing the fetch.
+    // There is currently no easy way to know when the inline View has finished processing the fetch.
+    // This listener is a hack for our automated tests to know when the inline View has finished processing the fetch.
+    //
+    // See linear ticket MBL-427 to learn more about this limitation in our tests.
+    var refreshViewListener: (() -> Void)?
+
+    var inlineMessageManager: InlineMessageManager?
+
+    // Determines if the View is already trying to show a message or not.
+    private var isRenderingOrDisplayingAMessage: Bool {
+        inlineMessageManager != nil
+    }
+
+    // Subscriber to listen to changes in InAppMessageState.
+    private var inAppMessageStoreSubscriber: InAppMessageStoreSubscriber?
+
+    public init(elementId: String) {
+        super.init(frame: .zero)
+        self.elementId = elementId
+
+        // Setup the View and display a message, if one available. Since an elementId has been set.
+        setupView()
+        refreshView()
+    }
+
+    // This is called when the View is created from a Storyboard.
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+
+        setupView()
+        // An element id will not be set yet. No need to check for messages to display.
+    }
+
+    deinit {
+        dismissCurrentMessage()
+    }
+
+    private func setupView() {
+        // Subscribe to changes in InAppMessageState to listen for new messages to display.
+        inAppMessageStoreSubscriber = {
+            let subscriber = InAppMessageStoreSubscriber { [weak self] state in
+                // InAppMessageManager callback function might not be on UI thread.
+                // Switch to UI thread to update UI.
+                Task { @MainActor [weak self] in
+                    self?.refreshView(state: state)
+                }
+            }
+            // Subscribe to changes in `currentMessageState` property of `InAppMessageState`
+            inAppMessageManager.subscribe(comparator: { oldState, newState in
+                guard let elementId = self.elementId else { return true }
+
+                return oldState.embeddedMessagesState.getMessage(forElementId: elementId) == newState.embeddedMessagesState.getMessage(forElementId: elementId)
+
+            }, subscriber: subscriber)
+            return subscriber
+        }()
+    }
+
+    func teardownView() {
+        guard let subscriber = inAppMessageStoreSubscriber else { return }
+
+        logger.logWithModuleTag("Unsubscribing GistInlineMessageUIView from InAppMessageState", level: .debug)
+        if let message = inlineMessageManager?.currentMessage {
+            inAppMessageManager.dispatch(action: .dismissMessage(message: message, shouldLog: false, viaCloseAction: false))
+        }
+        inAppMessageManager.unsubscribe(subscriber: subscriber)
+        inAppMessageStoreSubscriber = nil
+    }
+
+    private func dismissCurrentMessage() {
+        if let message = inlineMessageManager?.currentMessage {
+            logger.logWithModuleTag("Dismissing current inline message: \(message.messageId)", level: .debug)
+            inAppMessageManager.dispatch(action: .dismissMessage(message: message, shouldLog: false, viaCloseAction: false))
+        }
+    }
+
+    private func refreshView(forceShowNextMessage: Bool = false) {
+        inAppMessageManager.fetchState { [weak self] state in
+            Task { @MainActor [weak self] in
+                self?.refreshView(state: state, forceShowNextMessage: forceShowNextMessage)
+            }
+        }
+    }
+
+    // Updates the state of the View, if needed. Call as often as you need if an event happens that may cause the View to need to update.
+    private func refreshView(state: InAppMessageState, forceShowNextMessage: Bool = false) {
+        defer {
+            // Always call the refreshViewListener at the end of the function to know processing is done.
+            refreshViewListener?()
+        }
+
+        // we cannot check if a message is available until element id set on View.
+        guard let elementId = elementId,
+              let embeddedMessageState = state.embeddedMessagesState.getMessage(forElementId: elementId)
+        else { return }
+
+        switch embeddedMessageState {
+        case .dismissed:
+            stopShowingMessageAndCleanup(messageState: embeddedMessageState)
+            delegate?.onNoMessageToDisplay()
+        case .readyToEmbed:
+            displayInAppMessage(state: state, messageState: embeddedMessageState)
+        case .embedded:
+            // We are already displaying or rendering a messsage. Do not show another message until the current message is closed.
+            // The main reason for this is when a message is tracked as "opened", the Gist backend will not return this message on the next fetch call.
+            // We want to continue showing a message even if the fetch no longer returns the message and the message is currently visible.
+            break
+        }
+    }
+
+    private func displayInAppMessage(state: InAppMessageState, messageState: InlineMessageState) {
+        guard let message = messageState.message else { return }
+
+        // If a different message is currently being shown, we want to replace the currently shown message with new message.
+        if isRenderingOrDisplayingAMessage {
+            delegate?.willChangeMessage(newTemplateId: message.messageId) {
+                // After the delegate is done, cleanup resources since we no longer need to show the previous message.
+                self.stopShowingMessageAndCleanup(messageState: messageState)
+                self.beginShowing(state: state, message: message)
+            }
+        } else {
+            beginShowing(state: state, message: message)
+        }
+    }
+
+    // Call when you want to begin the process of showing a new message.
+    private func beginShowing(state: InAppMessageState, message: Message) {
+        // Create a new manager for this new message to display and then display the manager's WebView.
+        let newInlineMessageManager = InlineMessageManager(state: state, message: message)
+        newInlineMessageManager.inlineMessageDelegate = self
+
+        let inlineView = newInlineMessageManager.inlineMessageView
+
+        addSubview(inlineView)
+
+        // Setup the WebView to be the same size as this View. When this View changes size, the WebView will change, too.
+        inlineView.translatesAutoresizingMaskIntoConstraints = false // Required in order for this inline View to have full control over the AutoLayout constraints for the WebView.
+        NSLayoutConstraint.activate([
+            inlineView.topAnchor.constraint(equalTo: topAnchor),
+            inlineView.leadingAnchor.constraint(equalTo: leadingAnchor),
+            inlineView.trailingAnchor.constraint(equalTo: trailingAnchor),
+            inlineView.bottomAnchor.constraint(equalTo: bottomAnchor)
+        ])
+
+        inlineMessageManager = newInlineMessageManager
+    }
+
+    private func stopShowingMessageAndCleanup(messageState: InlineMessageState) {
+        // If a message is currently being shown, cleanup and remove the webview so we can begin showing a new message.
+        // Cleanup needs to involve removing the WebView from it's superview and cleaning up the WebView's resources.
+        inlineMessageManager?.onMessageDismissed(messageState: messageState)
+        inlineMessageManager?.inlineMessageView.removeFromSuperview()
+        inlineMessageManager = nil
+    }
+}
+
+extension GistInlineMessageUIView: InlineMessageManagerDelegate {
+    // This function is called by WebView when the content's size changes.
+    public func sizeChanged(width: CGFloat, height: CGFloat) {
+        Task { @MainActor in // only update UI on main thread. This delegate function may not get called from UI thread.
+            // We keep the width the same to what the customer set it as.
+            // Update the height to match the aspect ratio of the web content.
+
+            self.updateContentSize(newHeight: height, newWidth: width)
+            self.delegate?.onMessageRendered(width: width, height: height)
+        }
+    }
+
+    func onCloseAction() {
+        Task { @MainActor in
+            self.refreshView(forceShowNextMessage: true)
+        }
+    }
+
+    // Called when "show another message" action button is clicked.
+    func willChangeMessage(newTemplateId: String) {
+        Task { @MainActor in
+            self.delegate?.willChangeMessage(newTemplateId: newTemplateId, onComplete: {
+                // Nothing to do when the animation is complete.
+                // the sizeChanged function will be called when the next message is rendered. sizeChanged will animate in the message for us.
+            })
+        }
+    }
+
+    // This method is called by InlineMessageManager when custom action button is tapped
+    // on an inline in-app message.
+    func onInlineButtonAction(message: Message, currentRoute: String, action: String, name: String) -> Bool {
+        guard let delegate = delegate else {
+            return false
+        }
+
+        return delegate.onInlineButtonAction(message: message, currentRoute: currentRoute, action: action, name: name)
+    }
+}
diff --git a/Sources/MessagingInApp/Views/SwiftUIInline.swift b/Sources/MessagingInApp/Views/SwiftUIInline.swift
new file mode 100644
index 000000000..72a16e47d
--- /dev/null
+++ b/Sources/MessagingInApp/Views/SwiftUIInline.swift
@@ -0,0 +1,134 @@
+import Foundation
+#if canImport(SwiftUI)
+import SwiftUI
+
+/**
+ A SwiftUI view that displays an inline in-app message.
+
+ A SwiftUI wrapper around inline in-app message View that provides some of the features of inline in-app messaging feature:
+ * Animate height changes when in-app messages render.
+ * Dismiss the message when close button pressed.
+ * Show loading indicators when loading new messages.
+
+ This is the public View that customers use in their SwiftUI app.
+ */
+public struct InlineMessage: View {
+    let elementId: String
+    let onActionClick: ((InAppMessage, String, String) -> Void)?
+
+    @State private var height: CGFloat = 0
+    @State private var isChangingMessages = false
+
+    public init(elementId: String, onActionClick: ((InAppMessage, String, String) -> Void)? = nil) {
+        self.elementId = elementId
+        self.onActionClick = onActionClick
+    }
+
+    public var body: some View {
+        // Create a parent wrapper around the UIKit view so we can animate height changes and close the in-app message.
+        // The UIKit View has an intrinstic size that we cannot manipulate directly. Instead, by wrapping the UIKit View, we have control over the visibility of the child UIKit View.
+
+        // The ZStack is used to overlay the loading indicator on top of the in-app message view.
+        ZStack {
+            InlineMessageUIViewRepresentable(elementId: elementId, onActionClick: onActionClick, onHeightChange: { newHeight in
+                isChangingMessages = false // if the loading view is currently being shown, hide it.
+
+                withAnimation(.easeIn(duration: 0.3)) {
+                    height = newHeight
+                }
+            }, willChangeMessage: { _, onComplete in
+                isChangingMessages = true // show loading view to indicate to the user that a new message is loading.
+                onComplete()
+            })
+            // Hide this view when the loading view is shown. This is so the background color of the loading View is the background color of the customer's screen.
+            // Do not use `if ... { InAppMessageView }` to show/hide the UIView because I have found that this method makes the Gist webview events no longer trigger, breaking the feature.
+            .opacity(isChangingMessages ? 0 : 1)
+
+            // Show a loading indicator when a new message is being fetched.
+            // Because we are using ZStack, this View will be displayed over the InAppMessageView.
+            if isChangingMessages {
+                ActivityIndicator()
+            }
+        }.frame(height: height) // By setting height on the parent container, we can dismiss a message by setting height to 0.
+    }
+}
+
+// UIViewRepresentable to wrap the UIKit in-app message View. Required to use UIKit views in SwiftUI.
+// Mostly used to send events between the two frameworks: SwiftUI <--> UIKit.
+struct InlineMessageUIViewRepresentable: UIViewRepresentable {
+    public var elementId: String
+    public var onActionClick: ((InAppMessage, String, String) -> Void)?
+    public var onHeightChange: (CGFloat) -> Void
+    public var willChangeMessage: ((newTemplateId: String, onComplete: () -> Void)) -> Void
+
+    public init(elementId: String, onActionClick: ((InAppMessage, String, String) -> Void)?, onHeightChange: @escaping ((CGFloat) -> Void), willChangeMessage: @escaping ((newTemplateId: String, onComplete: () -> Void)) -> Void) {
+        self.elementId = elementId
+        self.onActionClick = onActionClick
+        self.onHeightChange = onHeightChange
+        self.willChangeMessage = willChangeMessage
+    }
+
+    public func makeUIView(context: Context) -> GistInlineMessageUIView {
+        let inlineMessageView = GistInlineMessageUIView(elementId: elementId)
+
+        inlineMessageView.delegate = context.coordinator
+
+        // Set the compression resistance of the content view to low so that the content view can be compressed to fit the available space.
+        // This fixes an issue where you rotate screen from portrait to landscape and back to portrait. Without this change, the view remains in landscape mode.
+        inlineMessageView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+
+        return inlineMessageView
+    }
+
+    public func updateUIView(_ uiView: GistInlineMessageUIView, context: Context) {}
+
+    public static func dismantleUIView(_ uiView: GistInlineMessageUIView, coordinator: Coordinator) {
+        uiView.teardownView()
+    }
+
+    public func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+
+    class Coordinator: NSObject, GistInlineMessageUIViewDelegate {
+        var parent: InlineMessageUIViewRepresentable
+
+        init(_ parent: InlineMessageUIViewRepresentable) {
+            self.parent = parent
+        }
+
+        public func onMessageRendered(width: CGFloat, height: CGFloat) {
+            parent.onHeightChange(height)
+        }
+
+        public func onNoMessageToDisplay() {
+            parent.onHeightChange(0)
+        }
+
+        public func onInlineButtonAction(message: Message, currentRoute: String, action: String, name: String) -> Bool {
+            guard let parent = parent.onActionClick else { return false }
+
+            parent(InAppMessage(gistMessage: message), action, name)
+
+            return true
+        }
+
+        public func willChangeMessage(newTemplateId: String, onComplete: @escaping () -> Void) {
+            parent.willChangeMessage((newTemplateId: newTemplateId, onComplete: onComplete))
+        }
+    }
+}
+
+// UIActivityIndicatorView to use in SwiftUI.
+// Must use this because SwiftUI activity indicator was introduced in iOS 14.
+struct ActivityIndicator: UIViewRepresentable {
+    func makeUIView(context: Context) -> UIActivityIndicatorView {
+        let indicator = UIActivityIndicatorView(style: .large)
+        indicator.startAnimating()
+        return indicator
+    }
+
+    func updateUIView(_ uiView: UIActivityIndicatorView, context: Context) {}
+}
+
+#endif
diff --git a/Sources/MessagingInApp/Views/UIKitInline.swift b/Sources/MessagingInApp/Views/UIKitInline.swift
new file mode 100644
index 000000000..32540eb33
--- /dev/null
+++ b/Sources/MessagingInApp/Views/UIKitInline.swift
@@ -0,0 +1,213 @@
+import CioInternalCommon
+import Foundation
+import UIKit
+
+// To handle inline custom button actions.
+public protocol InlineMessageUIViewDelegate: AnyObject, AutoMockable {
+    // This method is called when a custom button is tapped in an inline message.
+    func onActionClick(message: InAppMessage, actionValue: String, actionName: String)
+}
+
+/**
+ View that can be added to a customer's app UI to display inline in-app messages.
+
+ Usage:
+ 1. Create an instance of this View and add it to the customer's app UI.
+ ```
+ // you can construct an instance with code:
+ let inAppMessageView = InlineMessageUIView(elementId: "elementId")
+ view.addSubView(inAppMessageView)
+
+ // Or, if you use Storyboards:
+ @IBOutlet weak var inAppMessageView: InAppMessageView!
+ inAppMessageView.elementId = "elementId"
+ ```
+ 2. Position and set size of the View in app's UI. The View will adjust it's height automatically, but all other constraints are the responsibilty of app developer. You can set a height constraint if you want autolayout warnings to go away but know that the View will ignore this set height.
+ */
+public class InlineMessageUIView: UIView, GistInlineMessageUIViewDelegate {
+    // Can set in the constructor or can set later (like if you use Storyboards)
+    @IBInspectable public var elementId: String? {
+        didSet {
+            setupView()
+        }
+    }
+
+    // Delegate to handle custom action button tap.
+    public weak var onActionDelegate: InlineMessageUIViewDelegate?
+
+    var runningHeightChangeAnimation: UIViewPropertyAnimator?
+    var runningCrossFadeAnimation: UIViewPropertyAnimator?
+
+    var messageRenderingLoadingView: UIView? {
+        subviews.first { $0 is UIActivityIndicatorView }
+    }
+
+    var inAppMessageView: GistInlineMessageUIView? {
+        subviews.map { $0 as? GistInlineMessageUIView }.mapNonNil().first
+    }
+
+    public init(elementId: String) {
+        super.init(frame: .zero)
+        self.elementId = elementId
+
+        // Setup the View and display a message, if one available. Since an elementId has been set.
+        setupView()
+    }
+
+    // This is called when the View is created from a Storyboard.
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+
+        setupView()
+        // An element id will not be set yet. No need to check for messages to display.
+    }
+
+    deinit {
+        inAppMessageView?.teardownView()
+    }
+
+    private func setupView() {
+        guard let elementId, inAppMessageView == nil else {
+            return // We are already setup. No need to do again.
+        }
+
+        let inlineInAppMessageView = GistInlineMessageUIView(elementId: elementId)
+        inlineInAppMessageView.delegate = self
+        addSubview(inlineInAppMessageView)
+
+        inlineInAppMessageView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            inlineInAppMessageView.centerXAnchor.constraint(equalTo: centerXAnchor),
+            inlineInAppMessageView.centerYAnchor.constraint(equalTo: centerYAnchor),
+            inlineInAppMessageView.widthAnchor.constraint(equalTo: widthAnchor),
+            inlineInAppMessageView.heightAnchor.constraint(equalTo: heightAnchor)
+        ])
+
+        // It's important to have only 1 active constraint for height or UIKit will ignore some constraints.
+        // Try to re-use a constraint if one is already added instead of replacing it. Some scenarios such as
+        // when UIView is nested in a UIStackView and distribution is .fillProportionally, the height constraint StackView adds is important to keep.
+
+        if heightConstraint == nil {
+            // Customer did not set a height constraint. Create one so the View has one.
+            let heightConstraint = heightAnchor.constraint(equalToConstant: 0)
+            heightConstraint.priority = .required // in case a customer sets a height constraint, by us setting the highest priority, we try to have this constraint be used.
+            heightConstraint.isActive = true // set isActive as the last step.
+        }
+
+        heightConstraint?.constant = 0 // start at height 0 so the View does not show.
+        getRootSuperview()?.layoutIfNeeded() // Since we modified constraint, perform a UI refresh to apply the change.
+    }
+
+    public func onMessageRendered(width: CGFloat, height: CGFloat) {
+        // animate height change
+        guard let inAppMessageView = inAppMessageView else {
+            return
+        }
+
+        inAppMessageView.isHidden = false
+        // If current height is same, we don't need to animate as repeated animations can cause flicker
+        // and may result in view never showing up.
+        if height != frame.size.height {
+            animateHeight(to: height)
+        }
+
+        if let messageRenderingLoadingView = messageRenderingLoadingView {
+            animateFadeInOutInlineView(fromView: messageRenderingLoadingView, toView: inAppMessageView) {
+                messageRenderingLoadingView.removeFromSuperview()
+            }
+        }
+    }
+
+    public func onNoMessageToDisplay() {
+        animateHeight(to: 0)
+    }
+
+    public func onInlineButtonAction(message: Message, currentRoute: String, action: String, name: String) -> Bool {
+        // If delegate is not set then call the global `messageActionTaken` method
+        guard let onActionDelegate = onActionDelegate else {
+            return false
+        }
+        onActionDelegate.onActionClick(message: InAppMessage(gistMessage: message), actionValue: action, actionName: name)
+        return true
+    }
+
+    public func willChangeMessage(newTemplateId: String, onComplete: @escaping () -> Void) {
+        // animate in loading view
+        showLoadingView {
+            onComplete()
+        }
+    }
+
+    // Call when you want to show the loading View, indicating to the app user that a new message is being loaded.
+    private func showLoadingView(onComplete: @escaping () -> Void) {
+        // Before we begin showing loading view, check to see if we are in the correct state that we should perform this change.
+        // This is a safety check in case this function gets called multiple times. We don't want the UI to flicker by changing multiple times.
+        guard let currentlyDisplayedInAppWebView = inAppMessageView, messageRenderingLoadingView == nil else {
+            return onComplete()
+        }
+
+        // To provide the user with feedback indicating a new message is being rendered, show an activity indicator while the new message is loading.
+        let activityIndicator = UIActivityIndicatorView(style: .large)
+        activityIndicator.startAnimating()
+        activityIndicator.isHidden = true // start hidden so when we add the subview, it does not cause a flicker in the UI. Wait to show it when the animation begins.
+
+        addSubview(activityIndicator)
+        assert(messageRenderingLoadingView != nil, "Expect activity indicator to be added as a subview")
+
+        // Set autolayout constraints to position the activity indicator.
+        activityIndicator.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            activityIndicator.centerXAnchor.constraint(equalTo: centerXAnchor),
+            activityIndicator.centerYAnchor.constraint(equalTo: centerYAnchor),
+            activityIndicator.widthAnchor.constraint(equalTo: widthAnchor),
+            activityIndicator.heightAnchor.constraint(equalTo: heightAnchor)
+        ])
+
+        animateFadeInOutInlineView(fromView: currentlyDisplayedInAppWebView, toView: activityIndicator) {
+            onComplete()
+        }
+    }
+
+    private func animateHeight(to height: CGFloat) {
+        // this function can be called multiple times in short period of time so we could be in the middle of 1 animation. Cancel the current one and start new.
+        runningHeightChangeAnimation?.stopAnimation(true)
+
+        runningHeightChangeAnimation = UIViewPropertyAnimator(duration: 0.3, curve: .easeIn, animations: {
+            self.heightConstraint?.constant = height // Changing the height in animation block indicates we want to animate the height change.
+
+            // Since we modified constraint, perform a UI refresh to apply the change.
+            // It's important that we call layoutIfNeeded on the topmost superview in the hierarchy. During development, there were animiation issues if layoutIfNeeded was called on a different superview then the root.
+            // Example, given this UI:
+            // UIViewController
+            // └── UIStackView
+            //    └── InAppMessageView
+            // ...If we call layoutIfNeeded on superview (UIStackView), the animation will not work as expected.
+            // This is also why it's important that we do QA testing on the inline View when it's nested in a UIStackView.
+            self.getRootSuperview()?.layoutIfNeeded()
+        })
+
+        runningHeightChangeAnimation?.startAnimation()
+    }
+
+    // Takes in 2 Views. In 1 single animation, fades in 1 View while fading out the other.
+    private func animateFadeInOutInlineView(fromView: UIView, toView: UIView, onComplete: (() -> Void)?) {
+        runningCrossFadeAnimation?.stopAnimation(true) // cancel previous fade animation if there is one to assert this one will be called.
+
+        // Set an initial state for `toView` to begin the animation. Make sure the View is not hidden and is fully opaque.
+        toView.isHidden = false
+        toView.alpha = 0
+
+        // These are the final values that we are looking for after the animation.
+        runningCrossFadeAnimation = UIViewPropertyAnimator(duration: 0.1, curve: .linear, animations: {
+            fromView.alpha = 0
+            toView.alpha = 1
+        })
+
+        runningCrossFadeAnimation?.addCompletion { _ in
+            fromView.isHidden = true
+            onComplete?()
+        }
+
+        runningCrossFadeAnimation?.startAnimation()
+    }
+}
diff --git a/Sources/MessagingInApp/autogenerated/AutoMockable.generated.swift b/Sources/MessagingInApp/autogenerated/AutoMockable.generated.swift
index 12e3321f3..f9a354090 100644
--- a/Sources/MessagingInApp/autogenerated/AutoMockable.generated.swift
+++ b/Sources/MessagingInApp/autogenerated/AutoMockable.generated.swift
@@ -795,6 +795,57 @@ class InAppMessageManagerMock: InAppMessageManager, Mock {
     }
 }
 
+/**
+ Class to easily create a mocked version of the `InlineMessageUIViewDelegate` class.
+ This class is equipped with functions and properties ready for you to mock!
+
+ Note: This file is automatically generated. This means the mocks should always be up-to-date and has a consistent API.
+ See the SDK documentation to learn the basics behind using the mock classes in the SDK.
+ */
+public class InlineMessageUIViewDelegateMock: InlineMessageUIViewDelegate, Mock {
+    /// If *any* interactions done on mock. `true` if any method or property getter/setter called.
+    public var mockCalled: Bool = false //
+
+    public init() {
+        Mocks.shared.add(mock: self)
+    }
+
+    public func resetMock() {
+        onActionClickCallsCount = 0
+        onActionClickReceivedArguments = nil
+        onActionClickReceivedInvocations = []
+
+        mockCalled = false // do last as resetting properties above can make this true
+    }
+
+    // MARK: - onActionClick
+
+    /// Number of times the function was called.
+    @Atomic public private(set) var onActionClickCallsCount = 0
+    /// `true` if the function was ever called.
+    public var onActionClickCalled: Bool {
+        onActionClickCallsCount > 0
+    }
+
+    /// The arguments from the *last* time the function was called.
+    @Atomic public private(set) var onActionClickReceivedArguments: (message: InAppMessage, actionValue: String, actionName: String)?
+    /// Arguments from *all* of the times that the function was called.
+    @Atomic public private(set) var onActionClickReceivedInvocations: [(message: InAppMessage, actionValue: String, actionName: String)] = []
+    /**
+     Set closure to get called when function gets called. Great way to test logic or return a value for the function.
+     */
+    public var onActionClickClosure: ((InAppMessage, String, String) -> Void)?
+
+    /// Mocked function for `onActionClick(message: InAppMessage, actionValue: String, actionName: String)`. Your opportunity to return a mocked value and check result of mock in test code.
+    public func onActionClick(message: InAppMessage, actionValue: String, actionName: String) {
+        mockCalled = true
+        onActionClickCallsCount += 1
+        onActionClickReceivedArguments = (message: message, actionValue: actionValue, actionName: actionName)
+        onActionClickReceivedInvocations.append((message: message, actionValue: actionValue, actionName: actionName))
+        onActionClickClosure?(message, actionValue, actionName)
+    }
+}
+
 /**
  Class to easily create a mocked version of the `MessagingInAppInstance` class.
  This class is equipped with functions and properties ready for you to mock!
diff --git a/Sources/MessagingPush/autogenerated/AutoDependencyInjection.generated.swift b/Sources/MessagingPush/autogenerated/AutoDependencyInjection.generated.swift
index 3e36359e6..5016b96d5 100644
--- a/Sources/MessagingPush/autogenerated/AutoDependencyInjection.generated.swift
+++ b/Sources/MessagingPush/autogenerated/AutoDependencyInjection.generated.swift
@@ -57,9 +57,6 @@ extension DIGraphShared {
         _ = automaticPushClickHandling
         countDependenciesResolved += 1
 
-        _ = deepLinkUtil
-        countDependenciesResolved += 1
-
         _ = pushEventHandler
         countDependenciesResolved += 1
 
@@ -100,18 +97,6 @@ extension DIGraphShared {
         AutomaticPushClickHandlingImpl(notificationCenterAdapter: userNotificationsFrameworkAdapter, logger: logger)
     }
 
-    // DeepLinkUtil
-    @available(iOSApplicationExtension, unavailable)
-    var deepLinkUtil: DeepLinkUtil {
-        getOverriddenInstance() ??
-            newDeepLinkUtil
-    }
-
-    @available(iOSApplicationExtension, unavailable)
-    private var newDeepLinkUtil: DeepLinkUtil {
-        DeepLinkUtilImpl(logger: logger, uiKitWrapper: uIKitWrapper)
-    }
-
     // PushEventHandler
     @available(iOSApplicationExtension, unavailable)
     var pushEventHandler: PushEventHandler {
diff --git a/Sources/MessagingPush/autogenerated/AutoMockable.generated.swift b/Sources/MessagingPush/autogenerated/AutoMockable.generated.swift
index 70b84e8cf..7dc4643cf 100644
--- a/Sources/MessagingPush/autogenerated/AutoMockable.generated.swift
+++ b/Sources/MessagingPush/autogenerated/AutoMockable.generated.swift
@@ -124,57 +124,6 @@ class AutomaticPushClickHandlingMock: AutomaticPushClickHandling, Mock {
     }
 }
 
-/**
- Class to easily create a mocked version of the `DeepLinkUtil` class.
- This class is equipped with functions and properties ready for you to mock!
-
- Note: This file is automatically generated. This means the mocks should always be up-to-date and has a consistent API.
- See the SDK documentation to learn the basics behind using the mock classes in the SDK.
- */
-class DeepLinkUtilMock: DeepLinkUtil, Mock {
-    /// If *any* interactions done on mock. `true` if any method or property getter/setter called.
-    var mockCalled: Bool = false //
-
-    init() {
-        Mocks.shared.add(mock: self)
-    }
-
-    public func resetMock() {
-        handleDeepLinkCallsCount = 0
-        handleDeepLinkReceivedArguments = nil
-        handleDeepLinkReceivedInvocations = []
-
-        mockCalled = false // do last as resetting properties above can make this true
-    }
-
-    // MARK: - handleDeepLink
-
-    /// Number of times the function was called.
-    @Atomic private(set) var handleDeepLinkCallsCount = 0
-    /// `true` if the function was ever called.
-    var handleDeepLinkCalled: Bool {
-        handleDeepLinkCallsCount > 0
-    }
-
-    /// The arguments from the *last* time the function was called.
-    @Atomic private(set) var handleDeepLinkReceivedArguments: URL?
-    /// Arguments from *all* of the times that the function was called.
-    @Atomic private(set) var handleDeepLinkReceivedInvocations: [URL] = []
-    /**
-     Set closure to get called when function gets called. Great way to test logic or return a value for the function.
-     */
-    var handleDeepLinkClosure: ((URL) -> Void)?
-
-    /// Mocked function for `handleDeepLink(_ deepLinkUrl: URL)`. Your opportunity to return a mocked value and check result of mock in test code.
-    func handleDeepLink(_ deepLinkUrl: URL) {
-        mockCalled = true
-        handleDeepLinkCallsCount += 1
-        handleDeepLinkReceivedArguments = deepLinkUrl
-        handleDeepLinkReceivedInvocations.append(deepLinkUrl)
-        handleDeepLinkClosure?(deepLinkUrl)
-    }
-}
-
 /**
  Class to easily create a mocked version of the `MessagingPushInstance` class.
  This class is equipped with functions and properties ready for you to mock!
diff --git a/Tests/MessagingInApp/Extensions/GistExtensions.swift b/Tests/MessagingInApp/Extensions/GistExtensions.swift
index 28cff8816..9e1e383ce 100644
--- a/Tests/MessagingInApp/Extensions/GistExtensions.swift
+++ b/Tests/MessagingInApp/Extensions/GistExtensions.swift
@@ -2,7 +2,7 @@
 import Foundation
 
 extension Message {
-    convenience init(messageId: String = .random, priority: Int? = nil, campaignId: String = .random, pageRule: String? = nil, queueId: String? = .random) {
+    convenience init(messageId: String = .random, priority: Int? = nil, campaignId: String = .random, pageRule: String? = nil, elementId: String? = nil, queueId: String? = .random) {
         var gistProperties = [
             "gist": [
                 "campaignId": campaignId
@@ -11,6 +11,9 @@ extension Message {
         if let pageRule = pageRule {
             gistProperties["gist"]?["routeRuleApple"] = pageRule
         }
+        if let elementId = elementId {
+            gistProperties["gist"]?["elementId"] = elementId
+        }
 
         self.init(messageId: messageId, queueId: queueId, priority: priority, properties: gistProperties)
     }
diff --git a/Tests/MessagingInApp/State/InAppMessageStateTests.swift b/Tests/MessagingInApp/State/InAppMessageStateTests.swift
index 585a11cd8..1ca658fed 100644
--- a/Tests/MessagingInApp/State/InAppMessageStateTests.swift
+++ b/Tests/MessagingInApp/State/InAppMessageStateTests.swift
@@ -76,7 +76,7 @@ class InAppMessageStateTests: IntegrationTest {
         XCTAssertEqual(state.pollInterval, 600)
         XCTAssertNil(state.userId)
         XCTAssertNil(state.currentRoute)
-        XCTAssertEqual(state.currentMessageState, .initial)
+        XCTAssertEqual(state.modalMessageState, .initial)
         XCTAssertTrue(state.messagesInQueue.isEmpty)
         XCTAssertTrue(state.shownMessageQueueIds.isEmpty)
     }
@@ -122,7 +122,7 @@ class InAppMessageStateTests: IntegrationTest {
         await inAppMessageManager.dispatchAsync(action: .displayMessage(message: message))
 
         let state = await inAppMessageManager.state
-        XCTAssertEqual(state.currentMessageState, .displayed(message: message))
+        XCTAssertEqual(state.modalMessageState, .displayed(message: message))
         XCTAssertTrue(state.shownMessageQueueIds.contains("1"))
     }
 
@@ -133,7 +133,7 @@ class InAppMessageStateTests: IntegrationTest {
         await inAppMessageManager.dispatchAsync(action: .dismissMessage(message: message))
 
         let state = await inAppMessageManager.state
-        XCTAssertEqual(state.currentMessageState, .dismissed(message: message))
+        XCTAssertEqual(state.modalMessageState, .dismissed(message: message))
     }
 
     func test_resetState_expectInitialStateRestored() async {
@@ -147,7 +147,7 @@ class InAppMessageStateTests: IntegrationTest {
         XCTAssertEqual(state.environment, .production)
         XCTAssertNil(state.userId)
         XCTAssertNil(state.currentRoute)
-        XCTAssertEqual(state.currentMessageState, .initial)
+        XCTAssertEqual(state.modalMessageState, .initial)
         XCTAssertTrue(state.messagesInQueue.isEmpty)
         XCTAssertTrue(state.shownMessageQueueIds.isEmpty)
     }
@@ -168,10 +168,10 @@ class InAppMessageStateTests: IntegrationTest {
         XCTAssertEqual(state.messagesInQueue.count, 3)
 
         state = await inAppMessageManager.waitForState { state in
-            state.currentMessageState.isLoading
+            state.modalMessageState.isLoading
         }
 
-        if case .loading(let message) = state.currentMessageState {
+        if case .loading(let message) = state.modalMessageState {
             XCTAssertEqual(message.queueId, "2")
         } else {
             XCTFail("Expected loading state with highest priority message")
@@ -204,7 +204,7 @@ class InAppMessageStateTests: IntegrationTest {
         var state = await inAppMessageManager.state
         XCTAssertEqual(state.currentRoute, "home")
 
-        if case .loading(let loadingMessage) = state.currentMessageState {
+        if case .loading(let loadingMessage) = state.modalMessageState {
             XCTAssertEqual(loadingMessage.queueId, "1")
         } else {
             XCTFail("Expected loading state with message")
@@ -216,25 +216,123 @@ class InAppMessageStateTests: IntegrationTest {
         state = await inAppMessageManager.state
         XCTAssertEqual(state.currentRoute, "profile")
 
-        if case .dismissed(let dismissedMessage) = state.currentMessageState {
+        if case .dismissed(let dismissedMessage) = state.modalMessageState {
             XCTAssertEqual(dismissedMessage.queueId, "1")
         } else {
             XCTFail("Expected dismissed state")
         }
     }
 
+    // MARK: - Inline Tests
+
     func test_embedMessage_expectNoStateChange() async {
-        let message = Message(queueId: "1")
         let elementId = "testElementId"
 
+        let message = Message(elementId: elementId, queueId: "1")
+
         await inAppMessageManager.dispatchAsync(action: .setUserIdentifier(user: .random))
-        await inAppMessageManager.dispatchAsync(action: .embedMessage(message: message, elementId: elementId))
+        await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message]))
 
         let state = await inAppMessageManager.state
-        XCTAssertEqual(state.currentMessageState, .initial)
+        XCTAssertEqual(state.modalMessageState, .initial)
+        XCTAssertTrue(state.embeddedMessagesState.getMessage(forElementId: elementId)?.message?.queueId == "1")
         XCTAssertFalse(state.shownMessageQueueIds.contains("1"))
     }
 
+    func test_embedMessage_givenDuplicateElementId_expectOnlyOneMessageAdded() async {
+        let elementId = String.random
+        let message1 = Message(elementId: elementId, queueId: "1")
+        let message2 = Message(elementId: elementId, queueId: "2")
+
+        await inAppMessageManager.dispatchAsync(action: .setUserIdentifier(user: .random))
+        await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message1, message2]))
+
+        let state = await inAppMessageManager.state
+        let embeddedMessage = state.embeddedMessagesState.getMessage(forElementId: elementId)
+
+        XCTAssertNotNil(embeddedMessage)
+        XCTAssertEqual(embeddedMessage?.message?.queueId, "2") // Only the latest message should be embedded, since its a map
+    }
+
+    func test_dismissEmbeddedMessage_expectStateUpdatedToDismissed() async {
+        let elementId = String.random
+        let message = Message(elementId: elementId, queueId: "1")
+
+        await inAppMessageManager.dispatchAsync(action: .setUserIdentifier(user: .random))
+        await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message]))
+        await inAppMessageManager.dispatchAsync(action: .dismissMessage(message: message))
+
+        let state = await inAppMessageManager.state
+        let embeddedMessage = state.embeddedMessagesState.getMessage(forElementId: elementId)
+
+        XCTAssertNotNil(embeddedMessage)
+        XCTAssertEqual(embeddedMessage?.message?.queueId, "1")
+        XCTAssertEqual(embeddedMessage, .dismissed(message: message))
+    }
+
+    func test_readyToEmbedMessage_expectStateUpdatedToEmbedded() async {
+        let elementId = String.random
+        let message = Message(elementId: elementId, queueId: "1")
+
+        await inAppMessageManager.dispatchAsync(action: .setUserIdentifier(user: .random))
+        await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message]))
+        await inAppMessageManager.dispatchAsync(action: .displayMessage(message: message))
+
+        let state = await inAppMessageManager.state
+        let embeddedMessage = state.embeddedMessagesState.getMessage(forElementId: elementId)
+
+        XCTAssertNotNil(embeddedMessage)
+        XCTAssertEqual(embeddedMessage?.message?.queueId, "1")
+        XCTAssertEqual(embeddedMessage, .embedded(message: message, elementId: elementId))
+    }
+
+    func test_embedMessage_givenRouteMismatch_expectMessageNotEmbedded() async {
+        let elementId = String.random
+        let message = Message(pageRule: "home", elementId: elementId, queueId: "1")
+
+        await inAppMessageManager.dispatchAsync(action: .setUserIdentifier(user: .random))
+        await inAppMessageManager.dispatchAsync(action: .setPageRoute(route: "profile"))
+        await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message]))
+
+        let state = await inAppMessageManager.state
+        let embeddedMessage = state.embeddedMessagesState.getMessage(forElementId: elementId)
+
+        XCTAssertNil(embeddedMessage) // Message should not be embedded as the route doesn't match
+    }
+
+    func test_embedMessage_givenRouteMatch_expectMessageEmbedded() async {
+        let elementId = String.random
+        let message = Message(pageRule: "home", elementId: elementId, queueId: "1")
+
+        await inAppMessageManager.dispatchAsync(action: .setUserIdentifier(user: .random))
+        await inAppMessageManager.dispatchAsync(action: .setPageRoute(route: "home"))
+        await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message]))
+
+        let state = await inAppMessageManager.state
+        let embeddedMessage = state.embeddedMessagesState.getMessage(forElementId: elementId)
+
+        XCTAssertNotNil(embeddedMessage)
+        XCTAssertEqual(embeddedMessage?.message?.queueId, "1")
+    }
+
+    func test_processMessageQueue_givenMultipleEmbeddedMessages_expectAllEmbedded() async {
+        let message1 = Message(elementId: "element1", queueId: "1")
+        let message2 = Message(elementId: "element2", queueId: "2")
+
+        await inAppMessageManager.dispatchAsync(action: .setUserIdentifier(user: .random))
+        await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message1, message2]))
+
+        let state = await inAppMessageManager.state
+        let embeddedMessage1 = state.embeddedMessagesState.getMessage(forElementId: "element1")
+        let embeddedMessage2 = state.embeddedMessagesState.getMessage(forElementId: "element2")
+
+        XCTAssertNotNil(embeddedMessage1)
+        XCTAssertEqual(embeddedMessage1?.message?.queueId, "1")
+
+        XCTAssertNotNil(embeddedMessage2)
+        XCTAssertEqual(embeddedMessage2?.message?.queueId, "2")
+    }
+
     // MARK: - Engine Action Tests
 
     func test_engineAction_givenTapAction_expectCallbackCalled() async {
@@ -259,7 +357,7 @@ class InAppMessageStateTests: IntegrationTest {
         await inAppMessageManager.dispatchAsync(action: .engineAction(action: .messageLoadingFailed(message: message)))
 
         let state = await inAppMessageManager.state
-        XCTAssertEqual(state.currentMessageState, .dismissed(message: message))
+        XCTAssertEqual(state.modalMessageState, .dismissed(message: message))
 
         XCTAssertTrue(globalEventListener.errorWithMessageCalled)
         XCTAssertEqual(globalEventListener.errorWithMessageReceivedArguments?.deliveryId, message.gistProperties.campaignId)
@@ -276,7 +374,7 @@ class InAppMessageStateTests: IntegrationTest {
         await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message]))
 
         let state = await inAppMessageManager.state
-        XCTAssertEqual(state.currentMessageState, .dismissed(message: message))
+        XCTAssertEqual(state.modalMessageState, .dismissed(message: message))
         XCTAssertTrue(state.shownMessageQueueIds.contains(message.queueId!))
 
         XCTAssertEqual(globalEventListener.messageShownCallsCount, 1)
@@ -295,7 +393,7 @@ class InAppMessageStateTests: IntegrationTest {
         state = await inAppMessageManager.state
         XCTAssertNil(state.userId)
         XCTAssertEqual(state.currentRoute, "home")
-        XCTAssertEqual(state.currentMessageState, .initial)
+        XCTAssertEqual(state.modalMessageState, .initial)
         XCTAssertTrue(state.messagesInQueue.isEmpty)
 
         XCTAssertFalse(globalEventListener.messageShownCalled)
@@ -318,10 +416,10 @@ class InAppMessageStateTests: IntegrationTest {
         XCTAssertEqual(state.currentRoute, "home")
 
         state = await inAppMessageManager.waitForState { state in
-            state.currentMessageState.isLoading
+            state.modalMessageState.isLoading
         }
 
-        if case .loading(let loadingMessage) = state.currentMessageState {
+        if case .loading(let loadingMessage) = state.modalMessageState {
             XCTAssertEqual(loadingMessage.queueId, "1")
         } else {
             XCTFail("Expected loading state with message 1")
@@ -334,10 +432,10 @@ class InAppMessageStateTests: IntegrationTest {
         XCTAssertEqual(state.currentRoute, "profile")
 
         state = await inAppMessageManager.waitForState { state in
-            state.currentMessageState.isLoading
+            state.modalMessageState.isLoading
         }
 
-        if case .loading(let loadingMessage) = state.currentMessageState {
+        if case .loading(let loadingMessage) = state.modalMessageState {
             XCTAssertEqual(loadingMessage.queueId, "2")
         } else {
             XCTFail("Expected loading state with message 2")
@@ -352,18 +450,18 @@ class InAppMessageStateTests: IntegrationTest {
         await inAppMessageManager.dispatchAsync(action: .processMessageQueue(messages: [message]))
 
         var state = await inAppMessageManager.state
-        XCTAssertEqual(state.currentMessageState, .loading(message: message))
+        XCTAssertEqual(state.modalMessageState, .loading(message: message))
 
         try await dispatchAndWait(.setPageRoute(route: "profile"))
 
         state = await inAppMessageManager.state
-        XCTAssertEqual(state.currentMessageState, .dismissed(message: message))
+        XCTAssertEqual(state.modalMessageState, .dismissed(message: message))
         XCTAssertEqual(state.currentRoute, "profile")
 
         try await dispatchAndWait(.setPageRoute(route: "home"))
 
         state = await inAppMessageManager.state
-        XCTAssertEqual(state.currentMessageState, .loading(message: message))
+        XCTAssertEqual(state.modalMessageState, .loading(message: message))
     }
 
     // MARK: - Callback Tests