diff --git a/.gitignore b/.gitignore
index 35414c564..6d832f70d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,4 +65,6 @@ pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
 pom.xml.next
-release.properties
\ No newline at end of file
+release.properties
+
+jacoco.exec
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b205c63..5abfec8e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
 #### Added
 - nothing yet
 
@@ -12,6 +13,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 #### Changed
 - nothing yet
 
+## [3.5.0]
+#### Added
+- introduces support for embedded messaging: an eligibility–based, personalized messages sent from Iterable to your mobile and web apps, which can display them inline, using native interface components.
+- To display embedded messages, you can use customizable, out-of-the-box components provided by the SDK (cards, notifications, banners), or you can build fully custom components of your own design.
+- To learn more, read [Embedded Messages with Iterable's iOS SDK](https://support.iterable.com/hc/articles/23061840746900).
+
+#### Changed
+- `IterableConfig` is updated with an `enableEmbeddedMessaging` flag that needs to be set to true to allow use of embedded messaging functionality
+
+## [3.5.0-beta1](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.0-beta1)
+
 ## [3.4.17](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.17)
 #### Added
 - when JWT is invalid, `IterableAuthManager` is updated to fetch and store a new JWT token locally 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3b8d068d2..518e50cb1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Apr 28 13:23:09 PDT 2020
+#Tue Oct 10 10:01:47 MDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/iterableapi-ui/build.gradle b/iterableapi-ui/build.gradle
index be5fb9da7..74cb4284e 100644
--- a/iterableapi-ui/build.gradle
+++ b/iterableapi-ui/build.gradle
@@ -7,7 +7,7 @@ android {
     namespace 'com.iterable.iterableapi.ui'
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 28
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -37,17 +37,21 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation "com.github.bumptech.glide:glide:4.8.0"
+    implementation 'com.google.android.material:material:1.2.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
-
 }
 
 ext {
     libraryName = 'iterableapi-ui'
-    libraryVersion = '3.4.17'
+    libraryVersion = '3.5.0-beta1'
 }
 
 if (hasProperty("mavenPublishEnabled")) {
@@ -57,6 +61,8 @@ if (hasProperty("mavenPublishEnabled")) {
 task javadoc(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+
+    exclude '**/*.kt'
 }
 
 // A hack to import the classpath and BuildConfig into the javadoc task
diff --git a/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt b/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt
new file mode 100644
index 000000000..cec97ed48
--- /dev/null
+++ b/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt
@@ -0,0 +1,191 @@
+package com.iterable.iterableapi.ui.embedded
+
+import android.graphics.drawable.GradientDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import com.bumptech.glide.Glide
+import com.google.android.flexbox.FlexboxLayout
+import com.iterable.iterableapi.EmbeddedMessageElementsButton
+import com.iterable.iterableapi.IterableApi
+import com.iterable.iterableapi.IterableEmbeddedMessage
+import com.iterable.iterableapi.ui.R
+
+class IterableEmbeddedView(
+    private var viewType: IterableEmbeddedViewType,
+    private var message: IterableEmbeddedMessage,
+    private var config: IterableEmbeddedViewConfig?
+): Fragment() {
+
+    private val defaultBackgroundColor : Int by lazy  { getDefaultColor(viewType, R.color.notification_background_color, R.color.banner_background_color, R.color.banner_background_color) }
+    private val defaultBorderColor : Int by lazy { getDefaultColor(viewType, R.color.notification_border_color, R.color.banner_border_color, R.color.banner_border_color) }
+    private val defaultPrimaryBtnBackgroundColor: Int by lazy { getDefaultColor(viewType, R.color.white, R.color.white, R.color.banner_button_color) }
+    private val defaultPrimaryBtnTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.banner_button_color, R.color.white) }
+    private val defaultSecondaryBtnBackgroundColor: Int by lazy { getDefaultColor(viewType, R.color.notification_background_color, R.color.white, R.color.white) }
+    private val defaultSecondaryBtnTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.banner_button_color, R.color.banner_button_color) }
+    private val defaultTitleTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.title_text_color, R.color.title_text_color) }
+    private val defaultBodyTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.body_text_color, R.color.body_text_color) }
+    private val defaultBorderWidth = 1
+    private val defaultBorderCornerRadius = 8f
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
+        val view = when (viewType) {
+            IterableEmbeddedViewType.BANNER -> {
+                val bannerView = inflater.inflate(R.layout.banner_view, container, false)
+                bind(viewType, bannerView, message)
+                bannerView
+            }
+            IterableEmbeddedViewType.CARD -> {
+                val cardView = inflater.inflate(R.layout.card_view, container, false)
+                bind(viewType, cardView, message)
+                cardView
+            }
+            IterableEmbeddedViewType.NOTIFICATION -> {
+                val notificationView = inflater.inflate(R.layout.notification_view, container, false)
+                bind(viewType, notificationView, message)
+                notificationView
+            }
+        }
+
+        setDefaultAction(view, message)
+        configure(view, viewType, config)
+
+        return view
+    }
+
+    private fun configure(view: View, viewType: IterableEmbeddedViewType, config: IterableEmbeddedViewConfig?) {
+
+        val backgroundColor = config?.backgroundColor.takeIf { it != null } ?: defaultBackgroundColor
+        val borderColor = config?.borderColor.takeIf { it != null } ?: defaultBorderColor
+        val borderWidth = config?.borderWidth.takeIf { it != null } ?: defaultBorderWidth
+        val borderCornerRadius = config?.borderCornerRadius.takeIf { it != null } ?: defaultBorderCornerRadius
+
+        val primaryBtnBackgroundColor = config?.primaryBtnBackgroundColor.takeIf { it != null } ?: defaultPrimaryBtnBackgroundColor
+        val primaryBtnTextColor = config?.primaryBtnTextColor.takeIf { it != null } ?: defaultPrimaryBtnTextColor
+
+        val secondaryBtnBackgroundColor = config?.secondaryBtnBackgroundColor.takeIf { it != null } ?: defaultSecondaryBtnBackgroundColor
+        val secondaryBtnTextColor = config?.secondaryBtnTextColor.takeIf { it != null } ?: defaultSecondaryBtnTextColor
+
+        val titleTextColor = config?.titleTextColor.takeIf { it != null } ?: defaultTitleTextColor
+        val bodyTextColor = config?.bodyTextColor.takeIf { it != null } ?: defaultBodyTextColor
+
+        val gradientDrawable = GradientDrawable()
+
+        gradientDrawable.setColor(backgroundColor)
+        gradientDrawable.setStroke(borderWidth, borderColor)
+        gradientDrawable.cornerRadius = borderCornerRadius
+        view.setBackgroundDrawable(gradientDrawable)
+
+        val firstButton = view.findViewById<Button>(R.id.embedded_message_first_button)
+        val secondButton = view.findViewById<Button>(R.id.embedded_message_second_button)
+
+        val titleText = view.findViewById<TextView>(R.id.embedded_message_title)
+        val bodyText = view.findViewById<TextView>(R.id.embedded_message_body)
+
+        if(config?.primaryBtnBackgroundColor != null) {
+            val primaryBtnBackgroundDrawable = if(viewType == IterableEmbeddedViewType.NOTIFICATION)
+                ContextCompat.getDrawable(requireContext(), R.drawable.primary_notification_button_background) as? GradientDrawable
+                else ContextCompat.getDrawable(requireContext(), R.drawable.primary_banner_button_background) as? GradientDrawable
+            primaryBtnBackgroundDrawable?.setColor(primaryBtnBackgroundColor)
+
+            firstButton.setBackgroundDrawable(primaryBtnBackgroundDrawable)
+        }
+
+        if(config?.secondaryBtnBackgroundColor != null) {
+            val secondaryBtnBackgroundDrawable = if(viewType == IterableEmbeddedViewType.NOTIFICATION)
+                ContextCompat.getDrawable(requireContext(), R.drawable.secondary_notification_button_background) as? GradientDrawable
+                else ContextCompat.getDrawable(requireContext(), R.drawable.secondary_banner_button_background) as? GradientDrawable
+            secondaryBtnBackgroundDrawable?.setColor(secondaryBtnBackgroundColor)
+
+            secondButton.setBackgroundDrawable(secondaryBtnBackgroundDrawable)
+        }
+
+        firstButton.setTextColor(primaryBtnTextColor)
+        secondButton.setTextColor(secondaryBtnTextColor)
+
+        titleText.setTextColor(titleTextColor)
+        bodyText.setTextColor(bodyTextColor)
+    }
+
+    private fun bind(viewType: IterableEmbeddedViewType, view: View, message: IterableEmbeddedMessage): View  {
+        val embeddedMessageViewTitle: TextView = view.findViewById(R.id.embedded_message_title)
+        val embeddedMessageViewBody: TextView = view.findViewById(R.id.embedded_message_body)
+        val embeddedMessageViewButton: Button = view.findViewById(R.id.embedded_message_first_button)
+        val embeddedMessageViewButton2: Button = view.findViewById(R.id.embedded_message_second_button)
+
+        if(viewType != IterableEmbeddedViewType.NOTIFICATION) {
+            val embeddedMessageImageView: ImageView = view.findViewById(R.id.embedded_message_image)
+
+            if(message.elements?.mediaURL?.isEmpty() == true) {
+                embeddedMessageImageView.visibility = View.GONE
+            } else {
+                Glide.with(view.context).load(message.elements?.mediaURL).into(embeddedMessageImageView)
+                embeddedMessageImageView.contentDescription = message.elements?.mediaUrlCaption
+            }
+        }
+
+        embeddedMessageViewTitle.text = message.elements?.title
+        embeddedMessageViewBody.text = message.elements?.body
+
+        val buttons = message.elements?.buttons
+
+        if (buttons != null) {
+            setButton(embeddedMessageViewButton, buttons.getOrNull(0), message)
+
+            if (buttons.size > 1) {
+                setButton(embeddedMessageViewButton2, buttons.getOrNull(1), message)
+            } else {
+                embeddedMessageViewButton2.visibility = View.GONE
+            }
+
+        } else {
+            embeddedMessageViewButton.visibility = View.GONE
+            embeddedMessageViewButton2.visibility = View.GONE
+        }
+
+        return view
+    }
+
+    private fun setDefaultAction(view: View, message: IterableEmbeddedMessage) {
+        if(message.elements?.defaultAction != null) {
+            val clickedUrl = message.elements?.defaultAction?.data.takeIf { it?.isNotEmpty() == true } ?: message.elements?.defaultAction?.type
+
+            view.setOnClickListener {
+                IterableApi.getInstance().embeddedManager.handleEmbeddedClick(message, null, clickedUrl)
+                IterableApi.getInstance().trackEmbeddedClick(message, null, clickedUrl)
+            }
+        }
+    }
+
+    private fun setButton(buttonView: Button, button: EmbeddedMessageElementsButton?, message: IterableEmbeddedMessage) {
+        buttonView.visibility = if (button?.title == null) View.GONE else View.VISIBLE
+        buttonView.text = button?.title.orEmpty()
+
+        val clickedUrl = if (button?.action?.data?.isNotEmpty() == true) button.action?.data else button?.action?.type
+
+        buttonView.setOnClickListener {
+            IterableApi.getInstance().embeddedManager.handleEmbeddedClick(message, button?.id, clickedUrl)
+            IterableApi.getInstance().trackEmbeddedClick(message, button?.id, clickedUrl)
+        }
+    }
+
+    private fun getDefaultColor(viewType: IterableEmbeddedViewType, notificationColor: Int, cardColor: Int, bannerColor: Int): Int {
+        return when (viewType) {
+            IterableEmbeddedViewType.NOTIFICATION -> ContextCompat.getColor(requireContext(), notificationColor)
+            IterableEmbeddedViewType.CARD -> ContextCompat.getColor(requireContext(), cardColor)
+            else -> ContextCompat.getColor(requireContext(), bannerColor)
+        }
+    }
+}
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedViewConfig.kt b/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedViewConfig.kt
new file mode 100644
index 000000000..07527a409
--- /dev/null
+++ b/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedViewConfig.kt
@@ -0,0 +1,16 @@
+package com.iterable.iterableapi.ui.embedded
+
+import android.graphics.Color
+
+data class IterableEmbeddedViewConfig(
+    val backgroundColor: Int?,
+    val borderColor: Int?,
+    val borderWidth: Int?,
+    val borderCornerRadius: Float?,
+    val primaryBtnBackgroundColor: Int?,
+    val primaryBtnTextColor: Int?,
+    val secondaryBtnBackgroundColor: Int?,
+    val secondaryBtnTextColor: Int?,
+    val titleTextColor: Int?,
+    val bodyTextColor: Int?
+)
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedViewType.kt b/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedViewType.kt
new file mode 100644
index 000000000..3a27fe454
--- /dev/null
+++ b/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedViewType.kt
@@ -0,0 +1,7 @@
+package com.iterable.iterableapi.ui.embedded
+
+public enum class IterableEmbeddedViewType {
+    BANNER,
+    CARD,
+    NOTIFICATION
+}
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/banner_card_border.xml b/iterableapi-ui/src/main/res/drawable/banner_card_border.xml
new file mode 100644
index 000000000..2911b30b6
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/banner_card_border.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/banner_border_color" />
+
+    <solid android:color="@color/banner_background_color" />
+
+    <corners
+        android:radius="8dp" />
+</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/card_image_shape.xml b/iterableapi-ui/src/main/res/drawable/card_image_shape.xml
new file mode 100644
index 000000000..36ce249d5
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/card_image_shape.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shapeable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <corners
+        android:topLeftRadius="16dp"
+        android:topRightRadius="16dp"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+    />
+</shapeable>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/notification_view_border.xml b/iterableapi-ui/src/main/res/drawable/notification_view_border.xml
new file mode 100644
index 000000000..13c32a7ea
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/notification_view_border.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/notification_background_color" />
+
+    <solid android:color="@color/notification_border_color" />
+
+    <corners
+        android:radius="8dp" />
+</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/primary_banner_button_background.xml b/iterableapi-ui/src/main/res/drawable/primary_banner_button_background.xml
new file mode 100644
index 000000000..7d44a8e49
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/primary_banner_button_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/banner_button_color" />
+
+    <corners
+        android:radius="32dp" />
+</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/primary_card_button_background.xml b/iterableapi-ui/src/main/res/drawable/primary_card_button_background.xml
new file mode 100644
index 000000000..eb087387a
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/primary_card_button_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/white" />
+
+    <corners
+        android:radius="32dp" />
+</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/primary_notification_button_background.xml b/iterableapi-ui/src/main/res/drawable/primary_notification_button_background.xml
new file mode 100644
index 000000000..498fc89d9
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/primary_notification_button_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/notification_button_border_color" />
+
+    <corners
+        android:radius="32dp" />
+</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/secondary_banner_button_background.xml b/iterableapi-ui/src/main/res/drawable/secondary_banner_button_background.xml
new file mode 100644
index 000000000..eb087387a
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/secondary_banner_button_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/white" />
+
+    <corners
+        android:radius="32dp" />
+</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/secondary_card_button_background.xml b/iterableapi-ui/src/main/res/drawable/secondary_card_button_background.xml
new file mode 100644
index 000000000..eb087387a
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/secondary_card_button_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/white" />
+
+    <corners
+        android:radius="32dp" />
+</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/secondary_notification_button_background.xml b/iterableapi-ui/src/main/res/drawable/secondary_notification_button_background.xml
new file mode 100644
index 000000000..a42cf0e83
--- /dev/null
+++ b/iterableapi-ui/src/main/res/drawable/secondary_notification_button_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/notification_background_color" />
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/notification_background_color" />
+
+    <corners
+        android:radius="32dp" />
+</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/layout-v21/banner_view.xml b/iterableapi-ui/src/main/res/layout-v21/banner_view.xml
new file mode 100644
index 000000000..e55e32468
--- /dev/null
+++ b/iterableapi-ui/src/main/res/layout-v21/banner_view.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:layout_marginTop="8dp"
+    android:layout_marginStart="16dp"
+    android:layout_marginBottom="12dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp"
+    android:background="@drawable/banner_card_border"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/embedded_message_title"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text=""
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/embedded_message_image"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/embedded_message_body"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text=""
+        app:layout_constraintBottom_toTopOf="@+id/embedded_message_buttons_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/embedded_message_title"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <ImageView
+        android:id="@+id/embedded_message_image"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:contentDescription=""
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/embedded_message_buttons_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/embedded_message_first_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:background="@drawable/primary_banner_button_background"
+            android:ellipsize="end"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textColor="@color/white"
+            app:cornerRadius="32dp" />
+
+        <Button
+            android:id="@+id/embedded_message_second_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:background="@drawable/secondary_banner_button_background"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textColor="@color/white"
+            app:cornerRadius="32dp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/layout-v21/card_view.xml b/iterableapi-ui/src/main/res/layout-v21/card_view.xml
new file mode 100644
index 000000000..301627e75
--- /dev/null
+++ b/iterableapi-ui/src/main/res/layout-v21/card_view.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:layout_marginTop="8dp"
+    android:layout_marginLeft="16dp"
+    android:layout_marginBottom="12dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp"
+    android:background="@drawable/banner_card_border"
+    android:orientation="vertical">
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/embedded_message_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:contentDescription=""
+        android:scaleType="centerCrop"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/embedded_message_text_container"
+        app:shapeAppearanceOverlay="@style/classCardStyle" />
+
+    <LinearLayout
+        android:id="@+id/embedded_message_text_container"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/card_text_container_height"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@id/embedded_message_buttons_container"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextView
+            android:id="@+id/embedded_message_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="16dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text=""
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/embedded_message_image" />
+
+        <TextView
+            android:id="@+id/embedded_message_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="8dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text=""
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/embedded_message_title" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/embedded_message_buttons_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/embedded_message_first_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:background="@drawable/primary_card_button_background"
+            android:ellipsize="end"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textColor="@color/white"
+            app:cornerRadius="32dp" />
+
+        <Button
+            android:id="@+id/embedded_message_second_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:background="@drawable/secondary_card_button_background"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textColor="@color/white"
+            app:cornerRadius="32dp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/layout-v21/notification_view.xml b/iterableapi-ui/src/main/res/layout-v21/notification_view.xml
new file mode 100644
index 000000000..a1b56c0b6
--- /dev/null
+++ b/iterableapi-ui/src/main/res/layout-v21/notification_view.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="12dp"
+    android:layout_marginStart="16dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp"
+    android:background="@drawable/notification_view_border"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/embedded_message_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text=""
+        android:textSize="16sp"
+        android:textColor="@color/notification_text_color"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <TextView
+        android:id="@+id/embedded_message_body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text=""
+        android:textColor="@color/notification_text_color"
+        app:layout_constraintBottom_toTopOf="@+id/embedded_message_buttons_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/embedded_message_title"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <LinearLayout
+        android:id="@+id/embedded_message_buttons_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/embedded_message_first_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
+            android:textColor="@color/notification_text_color"
+            android:background="@drawable/primary_notification_button_background"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            app:cornerRadius="32dp" />
+
+        <Button
+            android:id="@+id/embedded_message_second_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:textColor="@color/notification_text_color"
+            android:background="@drawable/secondary_notification_button_background"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:text=""
+            android:textAllCaps="false"
+            app:cornerRadius="32dp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/layout/banner_view.xml b/iterableapi-ui/src/main/res/layout/banner_view.xml
new file mode 100644
index 000000000..fff39602c
--- /dev/null
+++ b/iterableapi-ui/src/main/res/layout/banner_view.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:layout_marginTop="8dp"
+    android:layout_marginStart="16dp"
+    android:layout_marginBottom="12dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp"
+    android:background="@drawable/banner_card_border"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/embedded_message_title"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text=""
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/embedded_message_image"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/embedded_message_body"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text=""
+        app:layout_constraintBottom_toTopOf="@+id/embedded_message_buttons_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/embedded_message_title"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <ImageView
+        android:id="@+id/embedded_message_image"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:contentDescription=""
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/embedded_message_buttons_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/embedded_message_first_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:background="@drawable/primary_banner_button_background"
+            android:ellipsize="end"
+            android:layout_marginStart="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textColor="@color/white"
+            app:cornerRadius="32dp" />
+
+        <Button
+            android:id="@+id/embedded_message_second_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/secondary_banner_button_background"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textColor="@color/white"
+            app:cornerRadius="32dp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/layout/card_view.xml b/iterableapi-ui/src/main/res/layout/card_view.xml
new file mode 100644
index 000000000..61a7b2ed6
--- /dev/null
+++ b/iterableapi-ui/src/main/res/layout/card_view.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:layout_marginTop="8dp"
+    android:layout_marginLeft="16dp"
+    android:layout_marginBottom="12dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp"
+    android:background="@drawable/banner_card_border"
+    android:orientation="vertical">
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/embedded_message_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:contentDescription=""
+        android:scaleType="centerCrop"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/embedded_message_text_container"
+        app:shapeAppearanceOverlay="@style/classCardStyle" />
+
+    <LinearLayout
+        android:id="@+id/embedded_message_text_container"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/card_text_container_height"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@id/embedded_message_buttons_container"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextView
+            android:id="@+id/embedded_message_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="16dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text=""
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/embedded_message_image" />
+
+        <TextView
+            android:id="@+id/embedded_message_body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="8dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text=""
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/embedded_message_title" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/embedded_message_buttons_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/embedded_message_first_button"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/primary_card_button_background"
+            android:ellipsize="end"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            app:cornerRadius="32dp" />
+
+        <Button
+            android:id="@+id/embedded_message_second_button"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_marginEnd="16dp"
+            android:layout_weight="1"
+            android:background="@drawable/secondary_card_button_background"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            app:cornerRadius="32dp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/layout/notification_view.xml b/iterableapi-ui/src/main/res/layout/notification_view.xml
new file mode 100644
index 000000000..23b1109b6
--- /dev/null
+++ b/iterableapi-ui/src/main/res/layout/notification_view.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="12dp"
+    android:layout_marginStart="16dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp"
+    android:background="@drawable/notification_view_border"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/embedded_message_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text=""
+        android:textSize="16sp"
+        android:textColor="@color/notification_text_color"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <TextView
+        android:id="@+id/embedded_message_body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text=""
+        android:textColor="@color/notification_text_color"
+        app:layout_constraintBottom_toTopOf="@+id/embedded_message_buttons_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/embedded_message_title"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <LinearLayout
+        android:id="@+id/embedded_message_buttons_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/embedded_message_first_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginStart="16dp"
+            android:textColor="@color/notification_text_color"
+            android:background="@drawable/primary_notification_button_background"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            app:cornerRadius="32dp" />
+
+        <Button
+            android:id="@+id/embedded_message_second_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginEnd="16dp"
+            android:textColor="@color/notification_text_color"
+            android:background="@drawable/secondary_notification_button_background"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:text=""
+            android:textAllCaps="false"
+            app:cornerRadius="32dp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/values/colors.xml b/iterableapi-ui/src/main/res/values/colors.xml
new file mode 100644
index 000000000..e8aa4714d
--- /dev/null
+++ b/iterableapi-ui/src/main/res/values/colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#ff8f00</color>
+    <color name="colorPrimaryDark">#c56000</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="white">#FFFFFF</color>
+    <color name="red">#ff3d00</color>
+    <color name="blue">#1565c0</color>
+    <color name="green">#64dd17</color>
+
+    <!--    New Iterable Colors-->
+    <color name="Primary_Red">#EF3D55</color>
+    <color name="Primary_Purple">#6A266D</color>
+    <color name="Primary_Cool_Green">#59C1A7</color>
+    <color name="Primary_Cyan">#34C3F2</color>
+
+    <color name="Secondary_Lavender">#C29DC9</color>
+    <color name="Secondary_Mustard">#F2CA1B</color>
+    <color name="Secondary_Salmon">#F36F4C</color>
+    <color name="Secondary_Gray">#999094</color>
+    <color name="Secondary_Not_Black">#4D4D4D</color>
+
+    <color name="notification_border_color">#C2F0FC</color>
+    <color name="notification_background_color">#E6FBFF</color>
+    <color name="notification_text_color">#2489A9</color>
+    <color name="notification_button_border_color">#E0DEDF</color>
+
+    <color name="banner_button_color">#6A266D</color>
+    <color name="banner_background_color">#FFFFFF</color>
+    <color name="banner_border_color">#E0DEDF</color>
+
+    <color name="title_text_color">#3D3A3B</color>
+    <color name="body_text_color">#787174</color>
+
+</resources>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/values/dimens.xml b/iterableapi-ui/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..b96a4d686
--- /dev/null
+++ b/iterableapi-ui/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="card_text_container_height">120dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/values/strings.xml b/iterableapi-ui/src/main/res/values/strings.xml
deleted file mode 100644
index 854200555..000000000
--- a/iterableapi-ui/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<resources>
-</resources>
diff --git a/iterableapi-ui/src/main/res/values/styles.xml b/iterableapi-ui/src/main/res/values/styles.xml
new file mode 100644
index 000000000..5edf53567
--- /dev/null
+++ b/iterableapi-ui/src/main/res/values/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="classCardStyle">
+        <item name="cornerSizeTopLeft">8dp</item>
+        <item name="cornerSizeTopRight">8dp</item>
+        <item name="cornerSizeBottomRight">0dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/iterableapi/build.gradle b/iterableapi/build.gradle
index 40abefab6..b1de84b8c 100644
--- a/iterableapi/build.gradle
+++ b/iterableapi/build.gradle
@@ -19,7 +19,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
 
-        buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.4.17\""
+        buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.5.0-beta1\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -65,11 +65,13 @@ dependencies {
     testImplementation 'androidx.test.ext:junit:1.1.5'
     testImplementation 'androidx.test:rules:1.5.0'
     testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation 'org.mockito:mockito-inline:2.8.47'
     testImplementation 'org.robolectric:robolectric:4.9.2'
     testImplementation 'org.robolectric:shadows-playservices:4.9.2'
     testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.2.2'
     testImplementation 'org.skyscreamer:jsonassert:1.5.0'
+    testImplementation project(':iterableapi')
 
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.3.0'
@@ -83,7 +85,7 @@ dependencies {
 
 ext {
     libraryName = 'iterableapi'
-    libraryVersion = '3.4.17'
+    libraryVersion = '3.5.0-beta1'
 }
 
 if (hasProperty("mavenPublishEnabled")) {
diff --git a/iterableapi/src/androidTest/java/com/iterable/iterableapi/IterableTestUtils.java b/iterableapi/src/androidTest/java/com/iterable/iterableapi/IterableTestUtils.java
index 5aa1420d4..16f48fb14 100644
--- a/iterableapi/src/androidTest/java/com/iterable/iterableapi/IterableTestUtils.java
+++ b/iterableapi/src/androidTest/java/com/iterable/iterableapi/IterableTestUtils.java
@@ -6,7 +6,8 @@
 public class IterableTestUtils {
     public static void createIterableApi() {
         IterableApi.sharedInstance = new IterableApi(mock(IterableInAppManager.class));
-        initIterableApi(null);
+        IterableConfig config = new IterableConfig.Builder().build();
+        initIterableApi(config);
         IterableApi.getInstance().setEmail("test_email");
     }
 
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/EmbeddedImpressionData.kt b/iterableapi/src/main/java/com/iterable/iterableapi/EmbeddedImpressionData.kt
new file mode 100644
index 000000000..e166fa2e9
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/EmbeddedImpressionData.kt
@@ -0,0 +1,18 @@
+package com.iterable.iterableapi
+
+import androidx.annotation.RestrictTo
+import java.util.Date
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+data class EmbeddedImpressionData(
+    val messageId: String,
+    val placementId: Long,
+    var displayCount: Int = 0,
+    var duration: Float = 0.0f,
+    var start: Date? = null
+) {
+    constructor(
+        messageId: String,
+        placementId: Long
+    ) : this(messageId, placementId,0, 0.0f, null)
+}
\ No newline at end of file
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/EmbeddedSessionManager.kt b/iterableapi/src/main/java/com/iterable/iterableapi/EmbeddedSessionManager.kt
new file mode 100644
index 000000000..889c838c6
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/EmbeddedSessionManager.kt
@@ -0,0 +1,122 @@
+package com.iterable.iterableapi
+
+import androidx.annotation.RestrictTo
+import java.util.Date
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class EmbeddedSessionManager {
+
+    private val TAG = "EmbeddedSessionManager"
+
+    private var impressions: MutableMap<String, EmbeddedImpressionData> = mutableMapOf()
+
+    var session: IterableEmbeddedSession = IterableEmbeddedSession(
+        null,
+        null,
+        null
+    )
+
+    fun isTracking(): Boolean {
+        return session.start != null
+    }
+
+    fun startSession() {
+        if (isTracking()) {
+            IterableLogger.e(TAG, "Embedded session started twice")
+            return
+        }
+
+        session = IterableEmbeddedSession(
+            Date(),
+            null,
+            null
+        )
+    }
+
+    fun endSession() {
+        if (!isTracking()) {
+            IterableLogger.e(TAG, "Embedded session ended without start")
+            return
+        }
+
+        if(impressions.isNotEmpty()) {
+            endAllImpressions()
+
+            val sessionToTrack = IterableEmbeddedSession(
+                session.start,
+                Date(),
+                getImpressionList()
+            )
+
+            IterableApi.getInstance().trackEmbeddedSession(sessionToTrack)
+
+            //reset session for next session start
+            session = IterableEmbeddedSession(
+                null,
+                null,
+                null
+            )
+
+            impressions = mutableMapOf()
+        }
+    }
+
+    fun startImpression(messageId: String, placementId: Long) {
+        var impressionData: EmbeddedImpressionData? = impressions[messageId]
+
+        if (impressionData == null) {
+            impressionData = EmbeddedImpressionData(messageId, placementId)
+            impressions[messageId] = impressionData
+        }
+
+        impressionData.start = Date()
+    }
+
+    fun pauseImpression(messageId: String) {
+        val impressionData: EmbeddedImpressionData? = impressions[messageId]
+
+        if (impressionData == null) {
+            IterableLogger.e(TAG, "onMessageImpressionEnded: impressionData not found")
+            return
+        }
+
+        if (impressionData.start == null) {
+            IterableLogger.e(TAG, "onMessageImpressionEnded: impressionStarted is null")
+            return
+        }
+
+        updateDisplayCountAndDuration(impressionData)
+    }
+
+    private fun endAllImpressions() {
+        for (impressionData in impressions.values) {
+            updateDisplayCountAndDuration(impressionData)
+        }
+    }
+
+    private fun getImpressionList(): List<IterableEmbeddedImpression>? {
+        val impressionList: MutableList<IterableEmbeddedImpression> = ArrayList()
+        for (impressionData in impressions.values) {
+            impressionList.add(
+                IterableEmbeddedImpression(
+                    impressionData.messageId,
+                    impressionData.placementId,
+                    impressionData.displayCount,
+                    impressionData.duration
+                )
+            )
+        }
+        return impressionList
+    }
+
+    private fun updateDisplayCountAndDuration(impressionData: EmbeddedImpressionData): EmbeddedImpressionData {
+        if (impressionData.start != null) {
+            impressionData.displayCount = impressionData.displayCount.plus(1)
+            impressionData.duration =
+                impressionData.duration.plus((Date().time - impressionData.start!!.time) / 1000.0)
+                    .toFloat()
+            impressionData.start = null
+        }
+        return impressionData
+    }
+}
\ No newline at end of file
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableActionSource.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableActionSource.java
index 9de6f93a9..5bd5dda6e 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableActionSource.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableActionSource.java
@@ -11,5 +11,8 @@ public enum IterableActionSource {
     APP_LINK,
 
     /** In-App Message */
-    IN_APP
+    IN_APP,
+
+    /** Embedded Message */
+    EMBEDDED
 }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
index b23c3d1fa..ff3baa679 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
@@ -45,6 +45,7 @@ public class IterableApi {
 
     IterableApiClient apiClient = new IterableApiClient(new IterableApiAuthProvider());
     private @Nullable IterableInAppManager inAppManager;
+    private @Nullable IterableEmbeddedManager embeddedManager;
     private String inboxSessionId;
     private IterableAuthManager authManager;
     private HashMap<String, String> deviceAttributes = new HashMap<>();
@@ -239,6 +240,61 @@ void getInAppMessages(int count, @NonNull IterableHelper.IterableActionHandler o
         apiClient.getInAppMessages(count, onCallback);
     }
 
+    /**
+     * Gets a list of placements for the list of placement ids passed in from Iterable and
+     * passes the result to the callback;
+     * To get list of messages as a list of Embedded Messages in memory, use
+     * {@link IterableEmbeddedManager#getMessages(long)} instead.
+     * If no placement ids are passed in, all available messages with corresponding placement id will be returned
+     *
+     * @param placementIds array of placement ids - optional
+     * @param onCallback
+     */
+
+    public void getEmbeddedMessages(@Nullable Long[] placementIds, @NonNull IterableHelper.IterableActionHandler onCallback) {
+        if (!checkSDKInitialization()) {
+            return;
+        }
+        apiClient.getEmbeddedMessages(placementIds, onCallback);
+    }
+
+    /**
+     * Gets a list of placements for the list of placement ids passed in from Iterable and
+     * passes the result to the success or failure callback;
+     * To get list of messages as a list of Embedded Messages in memory, use
+     * {@link IterableEmbeddedManager#getMessages(long)} instead.
+     * If no placement ids are passed in, all available messages with corresponding placement id will be returned
+     *
+     * @param placementIds array of placement ids - optional
+     * @param onSuccess
+     * @param onFailure
+     */
+
+    public void getEmbeddedMessages(@Nullable Long[] placementIds, @NonNull IterableHelper.SuccessHandler onSuccess, @NonNull IterableHelper.FailureHandler onFailure) {
+        if (!checkSDKInitialization()) {
+            return;
+        }
+        apiClient.getEmbeddedMessages(placementIds, onSuccess, onFailure);
+    }
+
+    /**
+     * A package-private method to get a list of Embedded Messages from Iterable;
+     * Passes the result to the success or failure callback.
+     * Used by the IterableEmbeddedManager.
+     *
+     * To get list of messages as a list of EmbeddedMessages in memory, use
+     * {@link IterableEmbeddedManager#getMessages(long)} instead
+     *
+     * @param onSuccess
+     * @param onFailure
+     */
+    void getEmbeddedMessages(@NonNull IterableHelper.SuccessHandler onSuccess, @NonNull IterableHelper.FailureHandler onFailure) {
+        if (!checkSDKInitialization()) {
+            return;
+        }
+        apiClient.getEmbeddedMessages(null, onSuccess, onFailure);
+    }
+
     /**
      * Tracks in-app delivery events (per in-app)
      * @param message the in-app message to be tracked as delivered */
@@ -255,6 +311,22 @@ void trackInAppDelivery(@NonNull IterableInAppMessage message) {
         apiClient.trackInAppDelivery(message);
     }
 
+    /**
+     * Tracks embedded message received events (per embedded message)
+     * @param message the embedded message to be tracked as received */
+    void trackEmbeddedMessageReceived(@NonNull IterableEmbeddedMessage message) {
+        if (!checkSDKInitialization()) {
+            return;
+        }
+
+        if (message == null) {
+            IterableLogger.e(TAG, "trackEmbeddedMessageReceived: message is null");
+            return;
+        }
+
+        apiClient.trackEmbeddedMessageReceived(message);
+    }
+
     private String getPushIntegrationName() {
         if (config.pushIntegrationName != null) {
             return config.pushIntegrationName;
@@ -269,6 +341,7 @@ private void logoutPreviousUser() {
         }
 
         getInAppManager().reset();
+        getEmbeddedManager().reset();
         getAuthManager().clearRefreshTimer();
 
         apiClient.onLogout();
@@ -526,6 +599,12 @@ public static void initialize(@NonNull Context context, @NonNull String apiKey,
                     sharedInstance.config.useInMemoryStorageForInApps);
         }
 
+        if (sharedInstance.embeddedManager == null) {
+            sharedInstance.embeddedManager = new IterableEmbeddedManager(
+                    sharedInstance
+            );
+        }
+
         loadLastSavedConfiguration(context);
         IterablePushNotificationUtil.processPendingAction(context);
         if (DeviceInfoUtils.isFireTV(context.getPackageManager())) {
@@ -555,12 +634,20 @@ public static void setContext(Context context) {
         this.inAppManager = inAppManager;
     }
 
+    @VisibleForTesting
+    IterableApi(IterableInAppManager inAppManager, IterableEmbeddedManager embeddedManager) {
+        config = new IterableConfig.Builder().build();
+        this.inAppManager = inAppManager;
+        this.embeddedManager = embeddedManager;
+    }
+
     @VisibleForTesting
     IterableApi(IterableApiClient apiClient, IterableInAppManager inAppManager) {
         config = new IterableConfig.Builder().build();
         this.apiClient = apiClient;
         this.inAppManager = inAppManager;
     }
+
 //endregion
 
 //region SDK public functions
@@ -578,6 +665,15 @@ public IterableInAppManager getInAppManager() {
         return inAppManager;
     }
 
+    @NonNull
+    public IterableEmbeddedManager getEmbeddedManager() {
+        if (embeddedManager == null) {
+            throw new RuntimeException("IterableApi must be initialized before calling getEmbeddedManager(). " +
+                    "Make sure you call IterableApi#initialize() in Application#onCreate");
+        }
+        return embeddedManager;
+    }
+
     /**
      * Returns the attribution information ({@link IterableAttributionInfo}) for last push open
      * or app link click from an email.
@@ -1103,6 +1199,26 @@ public void trackInAppClose(@NonNull IterableInAppMessage message, @Nullable Str
 
         apiClient.trackInAppClose(message, clickedURL, closeAction, clickLocation, inboxSessionId);
     }
+
+    /**
+     * Tracks when a link inside an embedded message is clicked
+     * @param message the embedded message to be tracked
+     * @param buttonIdentifier identifier that determines which button or if embedded message itself was clicked
+     * @param clickedUrl the URL of the clicked button or assigned to the embedded message itself
+     */
+    public void trackEmbeddedClick(@NonNull IterableEmbeddedMessage message, @Nullable String buttonIdentifier, @Nullable String clickedUrl) {
+        if (!checkSDKInitialization()) {
+            return;
+        }
+
+        if (message == null) {
+            IterableLogger.e(TAG, "trackEmbeddedClick: message is null");
+            return;
+        }
+
+        apiClient.trackEmbeddedClick(message, buttonIdentifier, clickedUrl);
+    }
+
 //endregion
 
 //region DEPRECATED - API public functions
@@ -1217,5 +1333,24 @@ public void setInboxSessionId(@Nullable String inboxSessionId) {
     public void clearInboxSessionId() {
         this.inboxSessionId = null;
     }
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public void trackEmbeddedSession(@NonNull IterableEmbeddedSession session) {
+        if (!checkSDKInitialization()) {
+            return;
+        }
+
+        if (session == null) {
+            IterableLogger.e(TAG, "trackEmbeddedSession: session is null");
+            return;
+        }
+
+        if (session.getStart() == null || session.getEnd() == null) {
+            IterableLogger.e(TAG, "trackEmbeddedSession: sessionStartTime and sessionEndTime must be set");
+            return;
+        }
+
+        apiClient.trackEmbeddedSession(session);
+    }
 //endregion
 }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java
index e190c0aa0..6781e1bf2 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java
@@ -217,6 +217,62 @@ public void getInAppMessages(int count, @NonNull IterableHelper.IterableActionHa
         }
     }
 
+    void getEmbeddedMessages(@Nullable Long[] placementIds, @NonNull IterableHelper.IterableActionHandler onCallback) {
+        JSONObject requestJSON = new JSONObject();
+
+        try {
+            addEmailOrUserIdToJson(requestJSON);
+            requestJSON.put(IterableConstants.KEY_PLATFORM, IterableConstants.ITBL_PLATFORM_ANDROID);
+            requestJSON.put(IterableConstants.ITBL_KEY_SDK_VERSION, IterableConstants.ITBL_KEY_SDK_VERSION_NUMBER);
+            requestJSON.put(IterableConstants.ITBL_SYSTEM_VERSION, Build.VERSION.RELEASE);
+            requestJSON.put(IterableConstants.KEY_PACKAGE_NAME, authProvider.getContext().getPackageName());
+
+            if (placementIds != null) {
+                StringBuilder pathBuilder = new StringBuilder(IterableConstants.ENDPOINT_GET_EMBEDDED_MESSAGES + "?");
+
+                for (Long placementId : placementIds) {
+                    pathBuilder.append("&placementIds=").append(placementId);
+                }
+
+                String path = pathBuilder.toString();
+                sendGetRequest(path, requestJSON, onCallback);
+            } else {
+                sendGetRequest(IterableConstants.ENDPOINT_GET_EMBEDDED_MESSAGES, requestJSON, onCallback);
+            }
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    void getEmbeddedMessages(@Nullable Long[] placementIds, @NonNull IterableHelper.SuccessHandler onSuccess, @NonNull IterableHelper.FailureHandler onFailure) {
+        JSONObject requestJSON = new JSONObject();
+
+        try {
+            addEmailOrUserIdToJson(requestJSON);
+            requestJSON.put(IterableConstants.KEY_PLATFORM, IterableConstants.ITBL_PLATFORM_ANDROID);
+            requestJSON.put(IterableConstants.ITBL_KEY_SDK_VERSION, IterableConstants.ITBL_KEY_SDK_VERSION_NUMBER);
+            requestJSON.put(IterableConstants.ITBL_SYSTEM_VERSION, Build.VERSION.RELEASE);
+            requestJSON.put(IterableConstants.KEY_PACKAGE_NAME, authProvider.getContext().getPackageName());
+
+            if (placementIds != null) {
+                StringBuilder pathBuilder = new StringBuilder(IterableConstants.ENDPOINT_GET_EMBEDDED_MESSAGES + "?");
+
+                for (Long placementId : placementIds) {
+                    pathBuilder.append("&placementIds=").append(placementId);
+                }
+
+                String path = pathBuilder.toString();
+                sendGetRequest(path, requestJSON, onSuccess, onFailure);
+            } else {
+                sendGetRequest(IterableConstants.ENDPOINT_GET_EMBEDDED_MESSAGES, requestJSON, onSuccess, onFailure);
+            }
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void trackInAppOpen(@NonNull String messageId) {
         JSONObject requestJSON = new JSONObject();
 
@@ -279,6 +335,22 @@ public void trackInAppClick(@NonNull IterableInAppMessage message, @NonNull Stri
         }
     }
 
+    public void trackEmbeddedClick(@NonNull IterableEmbeddedMessage message, @Nullable String buttonIdentifier, @Nullable String clickedUrl) {
+        JSONObject requestJSON = new JSONObject();
+
+        try {
+            addEmailOrUserIdToJson(requestJSON);
+            requestJSON.put(IterableConstants.KEY_MESSAGE_ID, message.getMetadata().getMessageId());
+            requestJSON.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_IDENTIFIER, buttonIdentifier);
+            requestJSON.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_TARGET_URL, clickedUrl);
+            requestJSON.put(IterableConstants.KEY_DEVICE_INFO, getDeviceInfoJson());
+
+            sendPostRequest(IterableConstants.ENDPOINT_TRACK_EMBEDDED_CLICK, requestJSON);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     void trackInAppClose(@NonNull IterableInAppMessage message, @Nullable String clickedURL, @NonNull IterableInAppCloseAction closeAction, @NonNull IterableInAppLocation clickLocation, @Nullable String inboxSessionId) {
         JSONObject requestJSON = new JSONObject();
 
@@ -317,6 +389,20 @@ void trackInAppDelivery(@NonNull IterableInAppMessage message) {
         }
     }
 
+    void trackEmbeddedMessageReceived(@NonNull IterableEmbeddedMessage message) {
+        JSONObject requestJSON = new JSONObject();
+
+        try {
+            addEmailOrUserIdToJson(requestJSON);
+            requestJSON.put(IterableConstants.KEY_MESSAGE_ID, message.getMetadata().getMessageId());
+            requestJSON.put(IterableConstants.KEY_DEVICE_INFO, getDeviceInfoJson());
+            sendPostRequest(IterableConstants.ENDPOINT_TRACK_EMBEDDED_RECEIVED, requestJSON);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+    }
+
     public void inAppConsume(@NonNull IterableInAppMessage message, @Nullable IterableInAppDeleteActionType source, @Nullable IterableInAppLocation clickLocation, @Nullable String inboxSessionId, @Nullable final IterableHelper.SuccessHandler successHandler, @Nullable final IterableHelper.FailureHandler failureHandler) {
         JSONObject requestJSON = new JSONObject();
 
@@ -377,6 +463,42 @@ public void trackInboxSession(@NonNull IterableInboxSession session, @Nullable S
         }
     }
 
+    public void trackEmbeddedSession(@NonNull IterableEmbeddedSession session) {
+        JSONObject requestJSON = new JSONObject();
+
+        try {
+            addEmailOrUserIdToJson(requestJSON);
+
+            JSONObject sessionJson = new JSONObject();
+            if (session.getId() != null) {
+                sessionJson.put(IterableConstants.KEY_EMBEDDED_SESSION_ID, session.getId());
+            }
+            sessionJson.put(IterableConstants.ITERABLE_EMBEDDED_SESSION_START, session.getStart().getTime());
+            sessionJson.put(IterableConstants.ITERABLE_EMBEDDED_SESSION_END, session.getEnd().getTime());
+
+            requestJSON.put(IterableConstants.ITERABLE_EMBEDDED_SESSION, sessionJson);
+
+            if (session.getImpressions() != null) {
+                JSONArray impressionsJsonArray = new JSONArray();
+                for (IterableEmbeddedImpression impression : session.getImpressions()) {
+                    JSONObject impressionJson = new JSONObject();
+                    impressionJson.put(IterableConstants.KEY_MESSAGE_ID, impression.getMessageId());
+                    impressionJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENT_ID, impression.getPlacementId());
+                    impressionJson.put(IterableConstants.ITERABLE_EMBEDDED_IMP_DISPLAY_COUNT, impression.getDisplayCount());
+                    impressionJson.put(IterableConstants.ITERABLE_EMBEDDED_IMP_DISPLAY_DURATION, impression.getDuration());
+                    impressionsJsonArray.put(impressionJson);
+                }
+                requestJSON.put(IterableConstants.ITERABLE_EMBEDDED_IMPRESSIONS, impressionsJsonArray);
+            }
+
+            requestJSON.putOpt(IterableConstants.KEY_DEVICE_INFO, getDeviceInfoJson());
+
+            sendPostRequest(IterableConstants.ENDPOINT_TRACK_EMBEDDED_SESSION, requestJSON);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     protected void trackPushOpen(int campaignId, int templateId, @NonNull String messageId, @Nullable JSONObject dataFields) {
         JSONObject requestJSON = new JSONObject();
 
@@ -549,6 +671,10 @@ void sendGetRequest(@NonNull String resourcePath, @NonNull JSONObject json, @Nul
         getRequestProcessor().processGetRequest(authProvider.getApiKey(), resourcePath, json, authProvider.getAuthToken(), onCallback);
     }
 
+    void sendGetRequest(@NonNull String resourcePath, @NonNull JSONObject json, @NonNull IterableHelper.SuccessHandler onSuccess, @NonNull IterableHelper.FailureHandler onFailure) {
+        getRequestProcessor().processGetRequest(authProvider.getApiKey(), resourcePath, json, authProvider.getAuthToken(), onSuccess, onFailure);
+    }
+
     void onLogout() {
         getRequestProcessor().onLogout(authProvider.getContext());
         authProvider.resetAuth();
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
index 73a8e8397..14f370c45 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java
@@ -84,6 +84,11 @@ public class IterableConfig {
 
     final boolean encryptionEnforced;
 
+    /**
+     * Allows for fetching embedded messages.
+     */
+    final boolean enableEmbeddedMessaging;
+
     private IterableConfig(Builder builder) {
         pushIntegrationName = builder.pushIntegrationName;
         urlHandler = builder.urlHandler;
@@ -99,6 +104,7 @@ private IterableConfig(Builder builder) {
         dataRegion = builder.dataRegion;
         useInMemoryStorageForInApps = builder.useInMemoryStorageForInApps;
         encryptionEnforced = builder.encryptionEnforced;
+        enableEmbeddedMessaging = builder.enableEmbeddedMessaging;
     }
 
     public static class Builder {
@@ -116,6 +122,7 @@ public static class Builder {
         private IterableDataRegion dataRegion = IterableDataRegion.US;
         private boolean useInMemoryStorageForInApps = false;
         private boolean encryptionEnforced = false;
+        private boolean enableEmbeddedMessaging = false;
 
         public Builder() {}
 
@@ -269,6 +276,15 @@ public Builder setUseInMemoryStorageForInApps(boolean useInMemoryStorageForInApp
             return this;
         }
 
+        /**
+         * Allows for fetching embedded messages.
+         * @param enableEmbeddedMessaging `true` will allow automatically fetching embedded messaging.
+         */
+        public Builder setEnableEmbeddedMessaging(boolean enableEmbeddedMessaging) {
+            this.enableEmbeddedMessaging = enableEmbeddedMessaging;
+            return this;
+        }
+
         @NonNull
         public IterableConfig build() {
             return new IterableConfig(this);
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
index 985d60480..f61b03315 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
@@ -53,6 +53,7 @@ public final class IterableConstants {
     public static final String KEY_USER                 = "user";
     public static final String KEY_USER_TEXT            = "userText";
     public static final String KEY_INBOX_SESSION_ID     = "inboxSessionId";
+    public static final String KEY_EMBEDDED_SESSION_ID     = "id";
     public static final String KEY_OFFLINE_MODE         = "offlineMode";
     public static final String KEY_FIRETV = "FireTV";
 
@@ -75,6 +76,10 @@ public final class IterableConstants {
     public static final String ENDPOINT_UPDATE_USER_SUBS        = "users/updateSubscriptions";
     public static final String ENDPOINT_TRACK_INAPP_CLOSE       = "events/trackInAppClose";
     public static final String ENDPOINT_GET_REMOTE_CONFIGURATION = "mobile/getRemoteConfiguration";
+    public static final String ENDPOINT_GET_EMBEDDED_MESSAGES   = "embedded-messaging/messages";
+    public static final String ENDPOINT_TRACK_EMBEDDED_RECEIVED   = "embedded-messaging/events/received";
+    public static final String ENDPOINT_TRACK_EMBEDDED_CLICK   = "embedded-messaging/events/click";
+    public static final String ENDPOINT_TRACK_EMBEDDED_SESSION   = "embedded-messaging/events/session";
 
     public static final String PUSH_APP_ID                      = "IterableAppId";
     public static final String PUSH_GCM_PROJECT_NUMBER          = "GCMProjectNumber";
@@ -166,6 +171,43 @@ public final class IterableConstants {
     public static final String PICASSO_CLASS = "com.squareup.picasso.Picasso";
     public static final String LOCATION_HEADER_FIELD = "Location";
 
+    //Embedded Message Constants
+    public static final String ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS  = "placements";
+    public static final String ITERABLE_EMBEDDED_MESSAGE  = "embeddedMessages";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_METADATA = "metadata";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_ELEMENTS = "elements";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_PAYLOAD = "payload";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_ID = "messageId";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_PLACEMENT_ID = "placementId";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_CAMPAIGN_ID = "campaignId";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_IS_PROOF = "isProof";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TITLE = "title";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BODY = "body";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL = "mediaUrl";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL_CAPTION = "mediaUrlCaption";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION = "defaultAction";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTONS = "buttons";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_IDENTIFIER = "buttonIdentifier";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_TARGET_URL = "targetUrl";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TEXT = "text";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_TYPE = "type";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_DATA = "data";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_ID = "id";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_TITLE = "title";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION = "action";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION_TYPE = "type";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION_DATA = "data";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TEXT_ID = "id";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TEXT_TEXT = "text";
+    public static final String ITERABLE_EMBEDDED_MESSAGE_TEXT_LABEL = "label";
+
+    public static final String ITERABLE_EMBEDDED_SESSION = "session";
+    public static final String ITERABLE_EMBEDDED_SESSION_START = "start";
+    public static final String ITERABLE_EMBEDDED_SESSION_END = "end";
+    public static final String ITERABLE_EMBEDDED_IMPRESSIONS = "impressions";
+    public static final String ITERABLE_EMBEDDED_IMP_DISPLAY_COUNT = "displayCount";
+    public static final String ITERABLE_EMBEDDED_IMP_DISPLAY_DURATION = "displayDuration";
+
     //In-App Constants
     public static final String ITERABLE_IN_APP_BGCOLOR_ALPHA    = "alpha";
     public static final String ITERABLE_IN_APP_BGCOLOR_HEX      = "hex";
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedManager.kt b/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedManager.kt
new file mode 100644
index 000000000..378fb1d40
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedManager.kt
@@ -0,0 +1,263 @@
+package com.iterable.iterableapi
+
+import android.content.Context
+import com.iterable.iterableapi.IterableHelper.SuccessHandler
+import org.json.JSONException
+import org.json.JSONObject
+
+public class IterableEmbeddedManager : IterableActivityMonitor.AppStateCallback {
+
+    // region constants
+    val TAG = "IterableEmbeddedManager"
+    // endregion
+
+    // region variables
+    private var localPlacementMessagesMap = mutableMapOf<Long, List<IterableEmbeddedMessage>>()
+    private var placementIds = mutableListOf<Long>()
+
+    private var updateHandleListeners = mutableListOf<IterableEmbeddedUpdateHandler>()
+    private var iterableApi: IterableApi
+    private var context: Context
+
+    private var embeddedSessionManager = EmbeddedSessionManager()
+
+    private var activityMonitor: IterableActivityMonitor? = null
+
+    // endregion
+
+    // region constructor
+
+    //Constructor of this class with actionHandler and updateHandler
+    public constructor(
+        iterableApi: IterableApi
+    ) {
+        this.iterableApi = iterableApi
+        this.context = iterableApi.mainActivityContext
+        activityMonitor = IterableActivityMonitor.getInstance()
+        activityMonitor?.addCallback(this)
+    }
+
+    // endregion
+
+    // region getters and setters
+
+    //Add updateHandler to the list
+    public fun addUpdateListener(updateHandler: IterableEmbeddedUpdateHandler) {
+        updateHandleListeners.add(updateHandler)
+    }
+
+    //Remove updateHandler from the list
+    public fun removeUpdateListener(updateHandler: IterableEmbeddedUpdateHandler) {
+        updateHandleListeners.remove(updateHandler)
+        embeddedSessionManager.endSession()
+    }
+
+    //Get the list of updateHandlers
+    public fun getUpdateHandlers(): List<IterableEmbeddedUpdateHandler> {
+        return updateHandleListeners
+    }
+
+    public fun getEmbeddedSessionManager(): EmbeddedSessionManager {
+        return embeddedSessionManager
+    }
+
+    // endregion
+
+    // region public methods
+
+    //Gets the list of embedded messages in memory without syncing
+    fun getMessages(placementId: Long): List<IterableEmbeddedMessage>? {
+        return localPlacementMessagesMap[placementId]
+    }
+
+    fun reset() {
+        localPlacementMessagesMap = mutableMapOf()
+    }
+
+    fun getPlacementIds(): List<Long> {
+        return placementIds
+    }
+
+    //Network call to get the embedded messages
+    fun syncMessages() {
+        if (iterableApi.config.enableEmbeddedMessaging) {
+            IterableLogger.v(TAG, "Syncing messages...")
+
+            IterableApi.sharedInstance.getEmbeddedMessages(SuccessHandler { data ->
+                IterableLogger.v(TAG, "Got response from network call to get embedded messages")
+                try {
+                    val previousPlacementIds = getPlacementIds()
+                    val currentPlacementIds: MutableList<Long> = mutableListOf()
+
+                    val placementsArray =
+                        data.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS)
+                    if (placementsArray != null) {
+                        //if there are no placements in the payload
+                        //reset the local message storage and trigger a UI update
+                        if (placementsArray.length() == 0) {
+                            reset()
+                            if (previousPlacementIds.isNotEmpty()) {
+                                updateHandleListeners.forEach {
+                                    IterableLogger.d(TAG, "Calling updateHandler")
+                                    it.onMessagesUpdated()
+                                }
+                            }
+                        } else {
+                            for (i in 0 until placementsArray.length()) {
+                                val placementJson = placementsArray.optJSONObject(i)
+                                val placement =
+                                    IterableEmbeddedPlacement.fromJSONObject(placementJson)
+                                val placementId = placement.placementId
+                                val messages = placement.messages
+
+                                currentPlacementIds.add(placementId)
+                                updateLocalMessageMap(placementId, messages)
+                            }
+                        }
+                    }
+
+                    // compare previous placements to the current placement payload
+                    val removedPlacementIds =
+                        previousPlacementIds.subtract(currentPlacementIds.toSet())
+
+                    //if there are placements removed, update the local storage and trigger UI update
+                    if (removedPlacementIds.isNotEmpty()) {
+                        removedPlacementIds.forEach {
+                            localPlacementMessagesMap.remove(it)
+                        }
+
+                        updateHandleListeners.forEach {
+                            IterableLogger.d(TAG, "Calling updateHandler")
+                            it.onMessagesUpdated()
+                        }
+                    }
+
+                    //store placements from payload for next comparison
+                    placementIds = currentPlacementIds
+
+                } catch (e: JSONException) {
+                    IterableLogger.e(TAG, e.toString())
+                }
+            }, object : IterableHelper.FailureHandler {
+                override fun onFailure(reason: String, data: JSONObject?) {
+                    if (reason.equals(
+                            "SUBSCRIPTION_INACTIVE",
+                            ignoreCase = true
+                        ) || reason.equals("Invalid API Key", ignoreCase = true)
+                    ) {
+                        IterableLogger.e(TAG, "Subscription is inactive. Stopping sync")
+                        broadcastSubscriptionInactive()
+                        return
+                    } else {
+                        //TODO: Instead of generic condition, have the retry only in certain situation
+                        IterableLogger.e(TAG, "Error while fetching embedded messages: $reason")
+                    }
+                }
+            })
+        }
+    }
+
+    fun handleEmbeddedClick(message: IterableEmbeddedMessage, buttonIdentifier: String?, clickedUrl: String?) {
+        if ((clickedUrl != null) && clickedUrl.toString().isNotEmpty()) {
+            if (clickedUrl.startsWith(IterableConstants.URL_SCHEME_ACTION)) {
+                // This is an action:// URL, pass that to the custom action handler
+                val actionName: String = clickedUrl.replace(IterableConstants.URL_SCHEME_ACTION, "")
+                IterableActionRunner.executeAction(
+                    context,
+                    IterableAction.actionCustomAction(actionName),
+                    IterableActionSource.EMBEDDED
+                )
+            } else if (clickedUrl.startsWith(IterableConstants.URL_SCHEME_ITBL)) {
+                // Handle itbl:// URLs, pass that to the custom action handler for compatibility
+                val actionName: String = clickedUrl.replace(IterableConstants.URL_SCHEME_ITBL, "")
+                IterableActionRunner.executeAction(
+                    context,
+                    IterableAction.actionCustomAction(actionName),
+                    IterableActionSource.EMBEDDED
+                )
+            } else {
+                IterableActionRunner.executeAction(
+                    context,
+                    IterableAction.actionOpenUrl(clickedUrl),
+                    IterableActionSource.EMBEDDED
+                )
+            }
+        }
+    }
+
+    private fun broadcastSubscriptionInactive() {
+        updateHandleListeners.forEach {
+            IterableLogger.d(TAG, "Broadcasting subscription inactive to the views")
+            it.onEmbeddedMessagingDisabled()
+        }
+    }
+
+    private fun updateLocalMessageMap(
+        placementId: Long,
+        remoteMessageList: List<IterableEmbeddedMessage>
+    ) {
+        IterableLogger.printInfo()
+        var localMessagesChanged = false
+
+        // Get local messages in a mutable list
+        val localMessageMap = mutableMapOf<String, IterableEmbeddedMessage>()
+        getMessages(placementId)?.toMutableList()?.forEach {
+            localMessageMap[it.metadata.messageId] = it
+        }
+
+        // Compare the remote list to local list
+        // if there are new messages, trigger a message update in UI and send out received events
+        remoteMessageList.forEach {
+            if (!localMessageMap.containsKey(it.metadata.messageId)) {
+                localMessagesChanged = true
+                IterableApi.getInstance().trackEmbeddedMessageReceived(it)
+            }
+        }
+
+        // Compare the local list to remote list
+        // if there are messages to remove, trigger a message update in UI
+        val remoteMessageMap = mutableMapOf<String, IterableEmbeddedMessage>()
+        remoteMessageList.forEach {
+            remoteMessageMap[it.metadata.messageId] = it
+        }
+
+        localPlacementMessagesMap[placementId]?.forEach {
+            if (!remoteMessageMap.containsKey(it.metadata.messageId)) {
+                localMessagesChanged = true
+            }
+        }
+
+        // update local message map for placement with remote message list
+        localPlacementMessagesMap[placementId] = remoteMessageList
+
+        //if local messages changed, trigger a message update in UI
+        if (localMessagesChanged) {
+            updateHandleListeners.forEach {
+                IterableLogger.d(TAG, "Calling updateHandler")
+                it.onMessagesUpdated()
+            }
+        }
+    }
+    // endregion
+
+    override fun onSwitchToForeground() {
+        IterableLogger.printInfo()
+        embeddedSessionManager.startSession()
+        IterableLogger.d(TAG, "Calling start session")
+        syncMessages()
+    }
+
+    override fun onSwitchToBackground() {
+        embeddedSessionManager.endSession()
+    }
+}
+
+// region interfaces
+
+public interface IterableEmbeddedUpdateHandler {
+    fun onMessagesUpdated()
+    fun onEmbeddedMessagingDisabled()
+}
+
+// endregion
+
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedPlacement.kt b/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedPlacement.kt
new file mode 100644
index 000000000..4d71ff55b
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedPlacement.kt
@@ -0,0 +1,348 @@
+package com.iterable.iterableapi
+
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+data class IterableEmbeddedPlacement(
+    val placementId: Long,
+    val messages: List<IterableEmbeddedMessage>
+) {
+    companion object {
+        val TAG = "ItblEmbeddedPlacement"
+        fun toJSONObject(placement: IterableEmbeddedPlacement): JSONObject {
+
+            val embeddedPlacementJson = JSONObject()
+
+            try {
+                embeddedPlacementJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENT_ID, placement.placementId)
+
+                val messagesJson = JSONArray()
+                for(i in 0 until placement.messages.size) {
+                    messagesJson.put(IterableEmbeddedMessage.toJSONObject(placement.messages[i]))
+                }
+                embeddedPlacementJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE, messagesJson)
+            } catch(e: JSONException) {
+                IterableLogger.e(TAG, "Error while serializing flex message", e)
+            }
+
+            return embeddedPlacementJson
+        }
+
+        fun fromJSONObject(placementJson: JSONObject): IterableEmbeddedPlacement {
+            val placementId: Long = placementJson.getLong(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENT_ID)
+
+            val messagesJson: JSONArray = placementJson.getJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE)
+            var messages: MutableList<IterableEmbeddedMessage> = mutableListOf()
+
+            for(i in 0 until messagesJson.length()) {
+                val messageJson: JSONObject = messagesJson.getJSONObject(i)
+                val message: IterableEmbeddedMessage = IterableEmbeddedMessage.fromJSONObject(messageJson)
+                messages.add(message)
+            }
+
+            return IterableEmbeddedPlacement(placementId, messages)
+        }
+    }
+}
+
+data class IterableEmbeddedMessage (
+    val metadata: EmbeddedMessageMetadata,
+    val elements: EmbeddedMessageElements? = null,
+    val payload: JSONObject? = null
+) {
+    companion object {
+        val TAG = "ItblEmbeddedMessage"
+        fun toJSONObject(message: IterableEmbeddedMessage): JSONObject {
+            val embeddedMessageJson = JSONObject()
+
+            try {
+                embeddedMessageJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_METADATA, EmbeddedMessageMetadata.toJSONObject(message.metadata))
+                embeddedMessageJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_ELEMENTS, EmbeddedMessageElements.toJSONObject(message.elements))
+                embeddedMessageJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PAYLOAD, message.payload)
+            } catch(e: JSONException) {
+                IterableLogger.e(TAG, "Error while serializing flex message", e)
+            }
+
+            return embeddedMessageJson
+        }
+
+
+        fun fromJSONObject(messageJson: JSONObject): IterableEmbeddedMessage {
+            val metadataJson: JSONObject = messageJson.getJSONObject(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_METADATA)
+            val metadata: EmbeddedMessageMetadata = EmbeddedMessageMetadata.fromJSONObject(metadataJson)
+
+            val elementsJson: JSONObject? = messageJson.optJSONObject(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_ELEMENTS)
+            val elements: EmbeddedMessageElements? = EmbeddedMessageElements.fromJSONObject(elementsJson)
+
+            val payload: JSONObject? = messageJson.optJSONObject(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PAYLOAD)
+
+            return IterableEmbeddedMessage(metadata, elements, payload)
+        }
+    }
+}
+
+class EmbeddedMessageMetadata(
+    var messageId: String,
+    val placementId: Long,
+    val campaignId: Int? = null,
+    val isProof: Boolean = false
+) {
+    companion object {
+        val TAG = "ItblEmbeddedMessageMetadata"
+
+        fun toJSONObject(metadata: EmbeddedMessageMetadata): JSONObject {
+            val metadataJson = JSONObject()
+
+            try {
+                metadataJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_ID, metadata.messageId)
+                metadataJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENT_ID, metadata.placementId)
+                metadataJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_CAMPAIGN_ID, metadata.campaignId)
+                metadataJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_IS_PROOF, metadata.isProof)
+            } catch (e: JSONException) {
+                IterableLogger.e(TAG, "Error while serializing flex metadata", e)
+            }
+
+            return metadataJson
+        }
+
+        fun fromJSONObject(metadataJson: JSONObject): EmbeddedMessageMetadata {
+            val messageId: String = metadataJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_ID)
+            val placementId: Long = metadataJson.optLong(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENT_ID)
+            val campaignId: Int = metadataJson.optInt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_CAMPAIGN_ID)
+            val isProof: Boolean = metadataJson.optBoolean(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_IS_PROOF)
+
+            return EmbeddedMessageMetadata(messageId, placementId, campaignId, isProof)
+        }
+    }
+}
+
+class EmbeddedMessageElements (
+    val title: String? = null,
+    val body: String? = null,
+    val mediaURL: String? = null,
+    val mediaUrlCaption: String? = null,
+    val defaultAction: EmbeddedMessageElementsDefaultAction? = null,
+    val buttons: List<EmbeddedMessageElementsButton>? = null,
+    val text: List<EmbeddedMessageElementsText>? = null
+) {
+
+    companion object {
+        val TAG = "ItblEmbeddedMessageElements"
+
+        fun toJSONObject(elements: EmbeddedMessageElements?): JSONObject {
+            val elementsJson = JSONObject()
+
+            try {
+                elementsJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TITLE, elements?.title)
+                elementsJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BODY, elements?.body)
+                elementsJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL, elements?.mediaURL)
+                elementsJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL_CAPTION, elements?.mediaUrlCaption)
+
+                if(elements?.defaultAction != null) {
+                    elementsJson.putOpt(
+                        IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION,
+                        EmbeddedMessageElementsDefaultAction.toJSONObject(elements.defaultAction)
+                    )
+                }
+
+                if(elements?.buttons != null) {
+                    val buttonsJson = JSONArray()
+                    for(i in 0..elements.buttons.size - 1) {
+                        buttonsJson.put(EmbeddedMessageElementsButton.toJSONObject(elements.buttons.get(i)))
+                    }
+                    elementsJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTONS, buttonsJson)
+                }
+
+                if(elements?.text != null) {
+                    val textJson = JSONArray()
+                    for(i in 0..elements.text.size - 1) {
+                        textJson.put(EmbeddedMessageElementsText.toJSONObject(elements.text.get(i)))
+                    }
+
+                    elementsJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT, textJson)
+                }
+            } catch (e: JSONException) {
+                IterableLogger.e(TAG, "Error while serializing flex elements", e)
+            }
+
+            return elementsJson
+        }
+        fun fromJSONObject(elementsJson: JSONObject?): EmbeddedMessageElements? {
+            if(elementsJson == null) {
+                return null
+            }
+
+            val title: String? = elementsJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TITLE)
+            val body: String? = elementsJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BODY)
+            val mediaURL: String? = elementsJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL)
+            val mediaUrlCaption: String? = elementsJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_MEDIA_URL)
+
+            val defaultActionJson: JSONObject? = elementsJson.optJSONObject(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION)
+            var defaultAction: EmbeddedMessageElementsDefaultAction? = null
+            if (defaultActionJson != null) {
+                defaultAction = EmbeddedMessageElementsDefaultAction.fromJSONObject(defaultActionJson)
+            }
+
+            val buttonsJson: JSONArray? = elementsJson.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTONS)
+            var buttons: MutableList<EmbeddedMessageElementsButton>? = mutableListOf()
+            if (buttonsJson != null) {
+                for(i in 0..buttonsJson.length() - 1) {
+                    val buttonJson: JSONObject = buttonsJson.getJSONObject(i)
+                    val button: EmbeddedMessageElementsButton = EmbeddedMessageElementsButton.fromJSONObject(buttonJson)
+                    buttons?.add(button)
+                }
+            } else {
+                buttons = null
+            }
+
+            val textsJson: JSONArray? = elementsJson.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT)
+            var texts: MutableList<EmbeddedMessageElementsText>? = mutableListOf()
+            if (textsJson != null) {
+                for(i in 0..textsJson.length() - 1) {
+                    val textJson: JSONObject = textsJson.getJSONObject(i)
+                    val text: EmbeddedMessageElementsText = EmbeddedMessageElementsText.fromJSONObject(textJson)
+                    texts?.add(text)
+                }
+            } else {
+                texts = null
+            }
+
+            return EmbeddedMessageElements(title, body, mediaURL, mediaUrlCaption, defaultAction, buttons, texts)
+        }
+    }
+}
+
+class EmbeddedMessageElementsButton (
+    val id: String,
+    val title: String? = null,
+    val action: EmbeddedMessageElementsButtonAction? = null
+) {
+
+    companion object {
+        val TAG = "ItblEmbeddedMessageButtons"
+
+        fun toJSONObject(button: EmbeddedMessageElementsButton): JSONObject {
+            val buttonJson = JSONObject()
+
+            try {
+                buttonJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_ID, button.id)
+                buttonJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_TITLE, button.title)
+
+                if(button.action != null) {
+                    buttonJson.putOpt(
+                        IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION,
+                        EmbeddedMessageElementsButtonAction.toJSONObject(button.action)
+                    )
+                }
+
+            } catch (e: JSONException) {
+                IterableLogger.e(TAG, "Error while serializing flex message button", e)
+            }
+
+            return buttonJson
+        }
+        fun fromJSONObject(buttonJson: JSONObject): EmbeddedMessageElementsButton {
+            val id: String = buttonJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_ID)
+            val title: String = buttonJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_TITLE)
+
+            val buttonActionJson: JSONObject? = buttonJson.optJSONObject(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION)
+            var action: EmbeddedMessageElementsButtonAction? = null
+            if (buttonActionJson != null) {
+                action = EmbeddedMessageElementsButtonAction.fromJSONObject(buttonActionJson)
+            }
+
+            return EmbeddedMessageElementsButton(id, title, action)
+        }
+
+    }
+}
+
+class EmbeddedMessageElementsDefaultAction (
+    val type: String,
+    val data: String
+) {
+
+    companion object {
+        val TAG = "ItblEmbeddedDefaultAction"
+
+        fun toJSONObject(defaultAction: EmbeddedMessageElementsDefaultAction): JSONObject {
+            val defaultActionJson = JSONObject()
+
+            try {
+                defaultActionJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_TYPE, defaultAction.type)
+                defaultActionJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_DATA, defaultAction.data)
+            } catch (e: JSONException) {
+                IterableLogger.e(TAG, "Error while serializing flex default action", e)
+            }
+
+            return defaultActionJson
+        }
+        fun fromJSONObject(defaultActionJson: JSONObject): EmbeddedMessageElementsDefaultAction {
+            val type: String = defaultActionJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_TYPE)
+            val data: String = defaultActionJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_DATA)
+
+            return EmbeddedMessageElementsDefaultAction(type, data)
+        }
+    }
+}
+
+class EmbeddedMessageElementsButtonAction (
+    val type: String,
+    val data: String
+) {
+
+    companion object {
+        val TAG = "ItblEmbeddedButtonAction"
+
+        fun toJSONObject(buttonAction: EmbeddedMessageElementsButtonAction): JSONObject {
+            val buttonActionJson = JSONObject()
+
+            try {
+                buttonActionJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION_TYPE, buttonAction.type)
+                buttonActionJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION_DATA, buttonAction.data)
+            } catch (e: JSONException) {
+                IterableLogger.e(TAG, "Error while serializing flex default action", e)
+            }
+
+            return buttonActionJson
+        }
+        fun fromJSONObject(buttonActionJson: JSONObject): EmbeddedMessageElementsButtonAction {
+            val type: String = buttonActionJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_ACTION_TYPE)
+            val data: String = buttonActionJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_DEFAULT_ACTION_DATA)
+
+            return EmbeddedMessageElementsButtonAction(type, data)
+        }
+    }
+}
+class EmbeddedMessageElementsText (
+    val id: String,
+    val text: String? = null,
+    val label: String? = null
+) {
+
+    companion object {
+        val TAG = "ItblEmbeddedMessageText"
+
+        fun toJSONObject(text: EmbeddedMessageElementsText): JSONObject {
+            val textJson = JSONObject()
+
+            try {
+                textJson.put(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT_ID, text.id)
+                textJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT_TEXT, text.text)
+                textJson.putOpt(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT_LABEL, text.label)
+            } catch (e: JSONException) {
+                IterableLogger.e(TAG, "Error while serializing flex message text", e)
+            }
+
+            return textJson
+        }
+        fun fromJSONObject(textJson: JSONObject): EmbeddedMessageElementsText {
+            val id: String = textJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT_ID)
+            val text: String = textJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT_TEXT)
+            val label: String = textJson.optString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_TEXT_LABEL)
+
+            return EmbeddedMessageElementsText(id, text, label)
+        }
+    }
+}
\ No newline at end of file
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedSession.kt b/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedSession.kt
new file mode 100644
index 000000000..96f5a1460
--- /dev/null
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedSession.kt
@@ -0,0 +1,26 @@
+package com.iterable.iterableapi
+
+import androidx.annotation.RestrictTo
+import java.util.Date
+import java.util.UUID
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public data class IterableEmbeddedSession(
+    val start: Date?,
+    val end: Date?,
+    val impressions: List<IterableEmbeddedImpression>?,
+    val id: String
+) {
+    constructor(
+        start: Date?,
+        end: Date?,
+        impressions: List<IterableEmbeddedImpression>?
+    ) : this(start, end, impressions, UUID.randomUUID().toString())
+}
+
+class IterableEmbeddedImpression(
+    val messageId: String,
+    val placementId: Long,
+    val displayCount: Int,
+    val duration: Float
+)
\ No newline at end of file
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableFirebaseMessagingService.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableFirebaseMessagingService.java
index 43d62e774..72df83464 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableFirebaseMessagingService.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableFirebaseMessagingService.java
@@ -70,13 +70,21 @@ public static boolean handleMessageReceived(@NonNull Context context, @NonNull R
 
             String notificationType = extras.getString("notificationType");
             if (notificationType != null && IterableApi.getInstance().getMainActivityContext() != null) {
-                if (notificationType.equals("InAppUpdate")) {
-                    IterableApi.getInstance().getInAppManager().syncInApp();
-                } else if (notificationType.equals("InAppRemove")) {
-                    String messageId = extras.getString("messageId");
-                    if (messageId != null) {
-                        IterableApi.getInstance().getInAppManager().removeMessage(messageId);
-                    }
+                switch (notificationType) {
+                    case "InAppUpdate":
+                        IterableApi.getInstance().getInAppManager().syncInApp();
+                        break;
+                    case "InAppRemove":
+                        String messageId = extras.getString("messageId");
+                        if (messageId != null) {
+                            IterableApi.getInstance().getInAppManager().removeMessage(messageId);
+                        }
+                        break;
+                    case "UpdateEmbedded":
+                        IterableApi.getInstance().getEmbeddedManager().syncMessages();
+                        break;
+                    default:
+                        break;
                 }
             }
         }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableInAppFragmentHTMLNotification.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableInAppFragmentHTMLNotification.java
index d5ca9655a..3e40899cf 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableInAppFragmentHTMLNotification.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableInAppFragmentHTMLNotification.java
@@ -104,7 +104,7 @@ public IterableInAppFragmentHTMLNotification() {
         this.backgroundAlpha = 0;
         this.messageId = "";
         insetPadding = new Rect();
-        this.setStyle(DialogFragment.STYLE_NO_FRAME, R.style.Theme_AppCompat_NoActionBar);
+        this.setStyle(DialogFragment.STYLE_NO_FRAME, androidx.appcompat.R.style.Theme_AppCompat_NoActionBar);
     }
 
     @Override
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/OfflineRequestProcessor.java b/iterableapi/src/main/java/com/iterable/iterableapi/OfflineRequestProcessor.java
index 78aa277cd..75020799d 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/OfflineRequestProcessor.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/OfflineRequestProcessor.java
@@ -30,6 +30,7 @@ class OfflineRequestProcessor implements RequestProcessor {
             IterableConstants.ENDPOINT_TRACK_INAPP_CLOSE,
             IterableConstants.ENDPOINT_TRACK_INBOX_SESSION,
             IterableConstants.ENDPOINT_TRACK_INAPP_DELIVERY,
+            IterableConstants.ENDPOINT_GET_EMBEDDED_MESSAGES,
             IterableConstants.ENDPOINT_INAPP_CONSUME));
 
     OfflineRequestProcessor(Context context) {
@@ -57,6 +58,12 @@ public void processGetRequest(@Nullable String apiKey, @NonNull String resourceP
         new IterableRequestTask().execute(request);
     }
 
+    @Override
+    public void processGetRequest(@Nullable String apiKey, @NonNull String resourcePath, @NonNull JSONObject json, String authToken,  @Nullable IterableHelper.SuccessHandler onSuccess, @Nullable IterableHelper.FailureHandler onFailure) {
+        IterableApiRequest request = new IterableApiRequest(apiKey, resourcePath, json, IterableApiRequest.GET, authToken, onSuccess, onFailure);
+        new IterableRequestTask().execute(request);
+    }
+
     @Override
     public void processPostRequest(@Nullable String apiKey, @NonNull String resourcePath, @NonNull JSONObject json, String authToken, @Nullable IterableHelper.SuccessHandler onSuccess, @Nullable IterableHelper.FailureHandler onFailure) {
         IterableApiRequest request = new IterableApiRequest(apiKey, resourcePath, json, IterableApiRequest.POST, authToken, onSuccess, onFailure);
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/OnlineRequestProcessor.java b/iterableapi/src/main/java/com/iterable/iterableapi/OnlineRequestProcessor.java
index 5ea4dd1f7..2766a4f97 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/OnlineRequestProcessor.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/OnlineRequestProcessor.java
@@ -20,6 +20,12 @@ public void processGetRequest(@Nullable String apiKey, @NonNull String resourceP
         new IterableRequestTask().execute(request);
     }
 
+    @Override
+    public void processGetRequest(@Nullable String apiKey, @NonNull String resourcePath, @NonNull JSONObject json, String authToken, @Nullable IterableHelper.SuccessHandler onSuccess, @Nullable IterableHelper.FailureHandler onFailure) {
+        IterableApiRequest request = new IterableApiRequest(apiKey, resourcePath, addCreatedAtToJson(json), IterableApiRequest.GET, authToken, onSuccess, onFailure);
+        new IterableRequestTask().execute(request);
+    }
+
     @Override
     public void processPostRequest(@Nullable String apiKey, @NonNull String resourcePath, @NonNull JSONObject json, String authToken, @Nullable IterableHelper.SuccessHandler onSuccess, @Nullable IterableHelper.FailureHandler onFailure) {
         IterableApiRequest request = new IterableApiRequest(apiKey, resourcePath, addCreatedAtToJson(json), IterableApiRequest.POST, authToken, onSuccess, onFailure);
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/RequestProcessor.java b/iterableapi/src/main/java/com/iterable/iterableapi/RequestProcessor.java
index 78e198a8d..4de818fd6 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/RequestProcessor.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/RequestProcessor.java
@@ -9,6 +9,9 @@
 
 public interface RequestProcessor {
     void processGetRequest(@Nullable String apiKey, @NonNull String resourcePath, @NonNull JSONObject json, String authToken, @Nullable IterableHelper.IterableActionHandler onCallback);
+
+    void processGetRequest(@Nullable String apiKey, @NonNull String resourcePath, @NonNull JSONObject json, String authToken, @Nullable IterableHelper.SuccessHandler onSuccess, @Nullable IterableHelper.FailureHandler onFailure);
+
     void processPostRequest(@Nullable String apiKey, @NonNull String resourcePath, @NonNull JSONObject json, String authToken, @Nullable IterableHelper.SuccessHandler onSuccess, @Nullable IterableHelper.FailureHandler onFailure);
     void onLogout(Context context);
 }
diff --git a/iterableapi/src/test/java/com/iterable/iterableapi/EmbeddedTestUtils.java b/iterableapi/src/test/java/com/iterable/iterableapi/EmbeddedTestUtils.java
new file mode 100644
index 000000000..1587e2c8b
--- /dev/null
+++ b/iterableapi/src/test/java/com/iterable/iterableapi/EmbeddedTestUtils.java
@@ -0,0 +1,17 @@
+package com.iterable.iterableapi;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+public class EmbeddedTestUtils {
+    public static IterableEmbeddedMessage getTestEmbeddedMessage() throws Exception {
+        JSONObject payload = new JSONObject(IterableTestUtils.getResourceString("embedded_payload_optional_elements_and_custom_payload.json"));
+        JSONArray jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS);
+
+        JSONObject placementJson = jsonArray.optJSONObject(0);
+        IterableEmbeddedPlacement placement = IterableEmbeddedPlacement.Companion.fromJSONObject(placementJson);
+        IterableEmbeddedMessage message = placement.getMessages().get(0);
+
+        return message;
+    }
+}
diff --git a/iterableapi/src/test/java/com/iterable/iterableapi/IterableApiTest.java b/iterableapi/src/test/java/com/iterable/iterableapi/IterableApiTest.java
index 95c7ea24f..0863e9472 100644
--- a/iterableapi/src/test/java/com/iterable/iterableapi/IterableApiTest.java
+++ b/iterableapi/src/test/java/com/iterable/iterableapi/IterableApiTest.java
@@ -80,7 +80,10 @@ public void tearDown() throws IOException {
 
     private void reInitIterableApi() {
         IterableInAppManager inAppManagerMock = mock(IterableInAppManager.class);
-        IterableApi.sharedInstance = new IterableApi(inAppManagerMock);
+        IterableEmbeddedManager embeddedManagerMock = mock(IterableEmbeddedManager.class);
+
+        IterableApi.sharedInstance = new IterableApi(inAppManagerMock, embeddedManagerMock);
+
         originalApiClient = IterableApi.sharedInstance.apiClient;
         mockApiClient = spy(originalApiClient);
         IterableApi.sharedInstance.apiClient = mockApiClient;
@@ -565,6 +568,28 @@ public void testInAppClickExtended() throws Exception {
         verifyDeviceInfo(requestJson);
     }
 
+    @Test
+    public void testEmbeddedClick() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+
+        IterableEmbeddedMessage message = EmbeddedTestUtils.getTestEmbeddedMessage();
+
+        IterableApi.initialize(getContext(), "apiKey", new IterableConfig.Builder().setAutoPushRegistration(false).build());
+        IterableApi.getInstance().setEmail("test@email.com");
+        IterableApi.getInstance().trackEmbeddedClick(message, message.getElements().getButtons().get(0).getId(), message.getElements().getButtons().get(0).getAction().getData());
+        shadowOf(getMainLooper()).idle();
+
+        RecordedRequest trackEmbeddedClickRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(trackEmbeddedClickRequest);
+        Uri uri = Uri.parse(trackEmbeddedClickRequest.getRequestUrl().toString());
+        assertEquals("/" + IterableConstants.ENDPOINT_TRACK_EMBEDDED_CLICK, uri.getPath());
+        JSONObject requestJson = new JSONObject(trackEmbeddedClickRequest.getBody().readUtf8());
+        assertEquals(message.getMetadata().getMessageId(), requestJson.getString(IterableConstants.KEY_MESSAGE_ID));
+        assertEquals(message.getElements().getButtons().get(0).getId(), requestJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_IDENTIFIER));
+        assertEquals(message.getElements().getButtons().get(0).getAction().getData(), requestJson.getString(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_BUTTON_TARGET_URL));
+        verifyDeviceInfo(requestJson);
+    }
+
     @Test
     public void testInAppDelivery() throws Exception {
         server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
@@ -586,6 +611,26 @@ public void testInAppDelivery() throws Exception {
         verifyDeviceInfo(requestJson);
     }
 
+    @Test
+    public void testEmbeddedMessageReceived() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+
+        IterableEmbeddedMessage message = EmbeddedTestUtils.getTestEmbeddedMessage();
+
+        IterableApi.initialize(getContext(), "apiKey", new IterableConfig.Builder().setAutoPushRegistration(false).build());
+        IterableApi.getInstance().setEmail("test@email.com");
+        IterableApi.getInstance().trackEmbeddedMessageReceived(message);
+        shadowOf(getMainLooper()).idle();
+
+        RecordedRequest trackEmbeddedDeliveredRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(trackEmbeddedDeliveredRequest);
+        Uri uri = Uri.parse(trackEmbeddedDeliveredRequest.getRequestUrl().toString());
+        assertEquals("/" + IterableConstants.ENDPOINT_TRACK_EMBEDDED_RECEIVED, uri.getPath());
+        JSONObject requestJson = new JSONObject(trackEmbeddedDeliveredRequest.getBody().readUtf8());
+        assertEquals(message.getMetadata().getMessageId(), requestJson.getString(IterableConstants.KEY_MESSAGE_ID));
+        verifyDeviceInfo(requestJson);
+    }
+
     @Test
     public void testInboxSession() throws Exception {
         server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
@@ -622,11 +667,11 @@ public void testInboxSession() throws Exception {
         IterableApi.getInstance().trackInboxSession(session);
         shadowOf(getMainLooper()).idle();
 
-        RecordedRequest trackInAppClickRequest = server.takeRequest(1, TimeUnit.SECONDS);
-        assertNotNull(trackInAppClickRequest);
-        Uri uri = Uri.parse(trackInAppClickRequest.getRequestUrl().toString());
+        RecordedRequest trackInboxSessionRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(trackInboxSessionRequest);
+        Uri uri = Uri.parse(trackInboxSessionRequest.getRequestUrl().toString());
         assertEquals("/" + IterableConstants.ENDPOINT_TRACK_INBOX_SESSION, uri.getPath());
-        JSONObject requestJson = new JSONObject(trackInAppClickRequest.getBody().readUtf8());
+        JSONObject requestJson = new JSONObject(trackInboxSessionRequest.getBody().readUtf8());
 
         // Check top-level fields
         assertEquals(sessionStartTime.getTime(), requestJson.getLong(IterableConstants.ITERABLE_INBOX_SESSION_START));
@@ -647,6 +692,61 @@ public void testInboxSession() throws Exception {
         assertEquals(5.5, impressionsJsonArray.getJSONObject(0).getDouble(IterableConstants.ITERABLE_INBOX_IMP_DISPLAY_DURATION));
     }
 
+    @Test
+    public void testEmbeddedSession() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+
+        IterableApi.initialize(getContext(), "apiKey", new IterableConfig.Builder().setAutoPushRegistration(false).build());
+        IterableApi.getInstance().setEmail("test@email.com");
+
+        // Set up test data
+        Date sessionStartTime = new Date();
+        List<IterableEmbeddedImpression> impressions = new ArrayList<>();
+        impressions.add(new IterableEmbeddedImpression(
+                "messageId1",
+                0,
+                1,
+                2.0f
+        ));
+        impressions.add(new IterableEmbeddedImpression(
+                "messageId2",
+                0,
+                3,
+                6.5f
+        ));
+
+        IterableEmbeddedSession session = new IterableEmbeddedSession(
+                sessionStartTime,
+                new Date(sessionStartTime.getTime() + 3600),
+                impressions);
+
+        IterableApi.getInstance().trackEmbeddedSession(session);
+        shadowOf(getMainLooper()).idle();
+
+        RecordedRequest trackEmbeddedSessionRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(trackEmbeddedSessionRequest);
+        Uri uri = Uri.parse(trackEmbeddedSessionRequest.getRequestUrl().toString());
+        assertEquals("/" + IterableConstants.ENDPOINT_TRACK_EMBEDDED_SESSION, uri.getPath());
+        JSONObject requestJson = new JSONObject(trackEmbeddedSessionRequest.getBody().readUtf8());
+
+        // Check top-level fields
+        verifyDeviceInfo(requestJson);
+
+        // Check session data
+        JSONObject sessionJson = requestJson.getJSONObject(IterableConstants.ITERABLE_EMBEDDED_SESSION);
+        assertEquals(session.getId(), sessionJson.getString(IterableConstants.KEY_EMBEDDED_SESSION_ID));
+        assertEquals(sessionStartTime.getTime(), sessionJson.getLong(IterableConstants.ITERABLE_EMBEDDED_SESSION_START));
+        assertEquals(sessionStartTime.getTime() + 3600, sessionJson.getLong(IterableConstants.ITERABLE_EMBEDDED_SESSION_END));
+
+        // Check impression data
+        JSONArray impressionsJsonArray = requestJson.getJSONArray(IterableConstants.ITERABLE_EMBEDDED_IMPRESSIONS);
+        assertEquals(2, impressionsJsonArray.length());
+        assertEquals("messageId1", impressionsJsonArray.getJSONObject(0).getString(IterableConstants.KEY_MESSAGE_ID));
+        assertEquals(0, impressionsJsonArray.getJSONObject(0).getLong(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENT_ID));
+        assertEquals(1, impressionsJsonArray.getJSONObject(0).getInt(IterableConstants.ITERABLE_EMBEDDED_IMP_DISPLAY_COUNT));
+        assertEquals(2.0, impressionsJsonArray.getJSONObject(0).getDouble(IterableConstants.ITERABLE_EMBEDDED_IMP_DISPLAY_DURATION));
+    }
+
     private void verifyMessageContext(JSONObject requestJson) throws JSONException {
         JSONObject messageContext = requestJson.getJSONObject(IterableConstants.KEY_MESSAGE_CONTEXT);
         assertNotNull(messageContext);
diff --git a/iterableapi/src/test/java/com/iterable/iterableapi/IterableEmbeddedManagerTest.java b/iterableapi/src/test/java/com/iterable/iterableapi/IterableEmbeddedManagerTest.java
new file mode 100644
index 000000000..30c4d7d1f
--- /dev/null
+++ b/iterableapi/src/test/java/com/iterable/iterableapi/IterableEmbeddedManagerTest.java
@@ -0,0 +1,248 @@
+package com.iterable.iterableapi;
+
+import static android.os.Looper.getMainLooper;
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
+
+import com.iterable.iterableapi.unit.PathBasedQueueDispatcher;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+
+public class IterableEmbeddedManagerTest extends BaseTest {
+    private MockWebServer server;
+    private PathBasedQueueDispatcher dispatcher;
+
+    @Before
+    public void setUp() throws IOException {
+        server = new MockWebServer();
+        dispatcher = new PathBasedQueueDispatcher();
+        server.setDispatcher(dispatcher);
+
+        IterableApi.overrideURLEndpointPath(server.url("").toString());
+        IterableApi.sharedInstance = new IterableApi();
+        IterableTestUtils.createIterableApiNew(new IterableTestUtils.ConfigBuilderExtender() {
+            @Override
+            public IterableConfig.Builder run(IterableConfig.Builder builder) {
+                return builder;
+            }
+        });
+    }
+
+    @After
+    public void tearDown() throws IOException {
+        server.shutdown();
+        server = null;
+    }
+
+    @Test
+    public void testSyncEmbeddedSinglePlacement() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_single_1.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+        assertEquals(1, embeddedManager.getMessages(0L).size());
+        assertEquals("doibjo4590340oidiobnw", embeddedManager.getMessages(0L).get(0).getMetadata().getMessageId());
+
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_single_2.json")));
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        assertEquals(1, embeddedManager.getMessages(1L).size());
+        assertEquals("dffe4fgfrews3f", embeddedManager.getMessages(1L).get(0).getMetadata().getMessageId());
+    }
+
+    @Test
+    public void testSyncEmbeddedMultiplePlacements() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_1.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+        assertEquals(1, embeddedManager.getMessages(0L).size());
+        assertEquals("doibjo4590340oidiobnw", embeddedManager.getMessages(0L).get(0).getMetadata().getMessageId());
+        assertEquals(1, embeddedManager.getMessages(1L).size());
+        assertEquals("faert442rjasiri99", embeddedManager.getMessages(1L).get(0).getMetadata().getMessageId());
+
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_2.json")));
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+        assertEquals(1, embeddedManager.getMessages(1L).size());
+        assertEquals("ewsd3fdrtj6ty", embeddedManager.getMessages(1L).get(0).getMetadata().getMessageId());
+
+        assertEquals(1, embeddedManager.getMessages(2L).size());
+        assertEquals("grewdvb54ut87y", embeddedManager.getMessages(2L).get(0).getMetadata().getMessageId());
+    }
+
+    @Test
+    public void testSyncEmptyPlacementsPayload() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_1.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        IterableEmbeddedUpdateHandler mockHandler1 = mock(IterableEmbeddedUpdateHandler.class);
+        IterableEmbeddedUpdateHandler mockHandler2 = mock(IterableEmbeddedUpdateHandler.class);
+
+        embeddedManager.addUpdateListener(mockHandler1);
+        embeddedManager.addUpdateListener(mockHandler2);
+
+        verify(mockHandler1, times(0)).onMessagesUpdated();
+        verify(mockHandler2, times(0)).onMessagesUpdated();
+
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+        assertEquals(1, embeddedManager.getMessages(0L).size());
+        assertEquals(1, embeddedManager.getMessages(1L).size());
+
+        verify(mockHandler1, times(2)).onMessagesUpdated();
+        verify(mockHandler2, times(2)).onMessagesUpdated();
+
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_empty.json")));
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+        assertNull(embeddedManager.getMessages(0L));
+        assertNull(embeddedManager.getMessages(1L));
+
+        verify(mockHandler1, times(4)).onMessagesUpdated();
+        verify(mockHandler2, times(4)).onMessagesUpdated();
+    }
+
+    @Test
+    public void testOnMessagesUpdatedWithEmptyLocalStorage() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_empty.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        IterableEmbeddedUpdateHandler mockHandler1 = mock(IterableEmbeddedUpdateHandler.class);
+        IterableEmbeddedUpdateHandler mockHandler2 = mock(IterableEmbeddedUpdateHandler.class);
+
+        embeddedManager.addUpdateListener(mockHandler1);
+        embeddedManager.addUpdateListener(mockHandler2);
+
+        verify(mockHandler1, times(0)).onMessagesUpdated();
+        verify(mockHandler2, times(0)).onMessagesUpdated();
+
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_empty.json")));
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        verify(mockHandler1, times(0)).onMessagesUpdated();
+        verify(mockHandler2, times(0)).onMessagesUpdated();
+    }
+
+    @Test
+    public void testReset() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_empty.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        IterableEmbeddedUpdateHandler mockHandler1 = mock(IterableEmbeddedUpdateHandler.class);
+        IterableEmbeddedUpdateHandler mockHandler2 = mock(IterableEmbeddedUpdateHandler.class);
+
+        embeddedManager.addUpdateListener(mockHandler1);
+        embeddedManager.addUpdateListener(mockHandler2);
+
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        embeddedManager.reset();
+        assertNull(embeddedManager.getMessages(0L));
+        assertNull(embeddedManager.getMessages(1L));
+    }
+
+    @Test
+    public void testOnMessagesUpdated() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_1.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        IterableEmbeddedUpdateHandler mockHandler1 = mock(IterableEmbeddedUpdateHandler.class);
+        IterableEmbeddedUpdateHandler mockHandler2 = mock(IterableEmbeddedUpdateHandler.class);
+
+        embeddedManager.addUpdateListener(mockHandler1);
+        embeddedManager.addUpdateListener(mockHandler2);
+
+        verify(mockHandler1, times(0)).onMessagesUpdated();
+        verify(mockHandler2, times(0)).onMessagesUpdated();
+
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+        verify(mockHandler1, times(2)).onMessagesUpdated();
+        verify(mockHandler2, times(2)).onMessagesUpdated();
+
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_2.json")));
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        verify(mockHandler1, times(5)).onMessagesUpdated();
+        verify(mockHandler2, times(5)).onMessagesUpdated();
+    }
+
+    @Test
+    public void testTrackEmbeddedMessageReceived() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_1.json")));
+
+        IterableApi iterableApiSpy = spy(IterableApi.getInstance());
+        IterableApi.sharedInstance = iterableApiSpy;
+
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        verify(iterableApiSpy).trackEmbeddedMessageReceived(embeddedManager.getMessages(0L).get(0));
+        verify(iterableApiSpy).trackEmbeddedMessageReceived(embeddedManager.getMessages(1L).get(0));
+
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_3.json")));
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        verify(iterableApiSpy).trackEmbeddedMessageReceived(embeddedManager.getMessages(0L).get(1));
+        verify(iterableApiSpy, never()).trackEmbeddedMessageReceived(embeddedManager.getMessages(0L).get(0));
+        verify(iterableApiSpy, never()).trackEmbeddedMessageReceived(embeddedManager.getMessages(1L).get(0));
+    }
+
+    @Test
+    public void testPlacementRemoval() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_1.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_multiple_2.json")));
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        assertNull(embeddedManager.getMessages(0L));
+        assertEquals(1, embeddedManager.getMessages(1L).size());
+        assertEquals(1, embeddedManager.getMessages(2L).size());
+    }
+
+    @Test
+    public void testOnEmbeddedMessagingDisabled() throws Exception {
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setResponseCode(401).setBody(IterableTestUtils.getResourceString("embedded_payload_bad_api_key.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        IterableEmbeddedUpdateHandler mockHandler1 = mock(IterableEmbeddedUpdateHandler.class);
+
+        embeddedManager.addUpdateListener(mockHandler1);
+
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        verify(mockHandler1).onEmbeddedMessagingDisabled();
+    }
+
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/java/com/iterable/iterableapi/IterableEmbeddedPlacementTest.kt b/iterableapi/src/test/java/com/iterable/iterableapi/IterableEmbeddedPlacementTest.kt
new file mode 100644
index 000000000..07170ba83
--- /dev/null
+++ b/iterableapi/src/test/java/com/iterable/iterableapi/IterableEmbeddedPlacementTest.kt
@@ -0,0 +1,448 @@
+package com.iterable.iterableapi
+
+import org.hamcrest.Matchers.`is`
+import org.json.JSONObject
+import org.junit.Assert.*
+import org.junit.Test
+import org.skyscreamer.jsonassert.JSONAssert
+import org.skyscreamer.jsonassert.JSONCompareMode
+
+class IterableEmbeddedPlacementTest {
+    @Test
+    fun embeddedPlacementDeserialization_elementsAndCustomPayloadDefined() {
+        val payload = JSONObject(IterableTestUtils.getResourceString("embedded_payload_optional_elements_and_custom_payload.json"))
+        val jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS)
+
+        if (jsonArray != null) {
+            // GIVEN an embedded message placement payload
+            val placementJson = jsonArray.optJSONObject(0)
+
+            // WHEN you deserialize the embedded message placement payload
+            val placement = IterableEmbeddedPlacement.fromJSONObject(placementJson)
+
+            val message = placement.messages[0]
+
+            val payload = JSONObject()
+            payload.put("someKey", "someValue")
+
+            // THEN we get appropriate embedded message object and associated placement id
+            assertNotNull(placement)
+            assertThat(411L, `is`(placement.placementId))
+
+            assertThat("doibjo4590340oidiobnw", `is` (message.metadata.messageId))
+            assertThat(411L, `is` (message.metadata.placementId))
+            assertThat(2324,`is` (message.metadata.campaignId))
+            assertThat(true, `is` (message.metadata.isProof))
+
+            assertThat("Iterable Coffee Shoppe", `is`(message.elements?.title))
+            assertThat("SAVE 15% OFF NOW", `is` (message.elements?.body))
+            assertThat("http://placekitten.com/200/300", `is` (message.elements?.mediaURL))
+
+            assertThat("someType", `is`(message.elements?.defaultAction?.type))
+            assertThat("someData", `is` (message.elements?.defaultAction?.data))
+
+            assertThat("reward-button", `is`(message.elements?.buttons?.get(0)?.id))
+            assertThat("REDEEM MEOW", `is` (message.elements?.buttons?.get(0)?.title))
+            assertThat("openUrl", `is` (message.elements?.buttons?.get(0)?.action?.type))
+            assertThat("https://www.google.com", `is` (message.elements?.buttons?.get(0)?.action?.data))
+
+            assertThat("body", `is`(message.elements?.text?.get(0)?.id))
+            assertThat("CATS RULE!!!", `is` (message.elements?.text?.get(0)?.text))
+            assertThat("label", `is` (message.elements?.text?.get(0)?.label))
+
+            JSONAssert.assertEquals(payload, message.payload, JSONCompareMode.STRICT_ORDER)
+        }
+    }
+
+    @Test
+    fun embeddedPlacementDeserialization_noCustomPayloadDefined() {
+        val payload = JSONObject(IterableTestUtils.getResourceString("embedded_payload_no_custom_payload.json"))
+        val jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS)
+
+        if (jsonArray != null) {
+            // GIVEN an embedded message placement payload
+            val placementJson = jsonArray.optJSONObject(0)
+
+            // WHEN you deserialize the embedded message placement payload
+            val placement = IterableEmbeddedPlacement.fromJSONObject(placementJson)
+
+            val message = placement.messages[0]
+
+            // THEN we get appropriate embedded message object and associated placement id
+            assertNotNull(placement)
+            assertThat(411L, `is` (placement.placementId))
+
+            assertThat("doibjo4590340oidiobnw", `is` (message.metadata.messageId))
+            assertThat(411L, `is` (message.metadata.placementId))
+            assertThat(2324,`is` (message.metadata.campaignId))
+            assertThat(true, `is` (message.metadata.isProof))
+
+            assertThat("Iterable Coffee Shoppe", `is`(message.elements?.title))
+            assertThat("SAVE 15% OFF NOW", `is` (message.elements?.body))
+            assertThat("http://placekitten.com/200/300", `is` (message.elements?.mediaURL))
+
+            assertThat("someType", `is`(message.elements?.defaultAction?.type))
+            assertThat("someData", `is` (message.elements?.defaultAction?.data))
+
+            assertThat("reward-button", `is`(message.elements?.buttons?.get(0)?.id))
+            assertThat("REDEEM MEOW", `is` (message.elements?.buttons?.get(0)?.title))
+
+            assertThat("someType", `is`(message.elements?.defaultAction?.type))
+            assertThat("someData", `is` (message.elements?.defaultAction?.data))
+
+            assertThat("body", `is`(message.elements?.text?.get(0)?.id))
+            assertThat("CATS RULE!!!", `is` (message.elements?.text?.get(0)?.text))
+            assertThat("label", `is` (message.elements?.text?.get(0)?.label))
+
+            assertNull(message.payload)
+        }
+    }
+
+    @Test
+    fun embeddedPlacementDeserialization_noButtonsOrText() {
+        val payload = JSONObject(IterableTestUtils.getResourceString("embedded_payload_no_buttons_no_text.json"))
+        val jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS)
+
+        if (jsonArray != null) {
+            // GIVEN an embedded message placement payload
+            val placementJson = jsonArray.optJSONObject(0)
+
+            // WHEN you deserialize the embedded message placement payload
+            val placement = IterableEmbeddedPlacement.fromJSONObject(placementJson)
+
+            val message = placement.messages[0]
+
+            val payload = JSONObject()
+            payload.put("someKey", "someValue")
+
+            // THEN we get appropriate embedded message object and associated placement id
+            assertNotNull(placement)
+            assertThat(411L, `is` (placement.placementId))
+
+            assertThat("doibjo4590340oidiobnw", `is` (message.metadata.messageId))
+            assertThat(411L, `is` (message.metadata.placementId))
+            assertThat(2324,`is` (message.metadata.campaignId))
+            assertThat(true, `is` (message.metadata.isProof))
+
+            assertThat("Iterable Coffee Shoppe", `is`(message.elements?.title))
+            assertThat("SAVE 15% OFF NOW", `is` (message.elements?.body))
+            assertThat("http://placekitten.com/200/300", `is` (message.elements?.mediaURL))
+
+            assertThat("someType", `is`(message.elements?.defaultAction?.type))
+            assertThat("someData", `is` (message.elements?.defaultAction?.data))
+
+            assertNull(message.elements?.buttons)
+            assertNull(message.elements?.text)
+
+            JSONAssert.assertEquals(payload, message.payload, JSONCompareMode.STRICT_ORDER)
+        }
+    }
+
+    @Test
+    fun embeddedPlacementDeserialization_noElementsOrCustomPayloadDefined() {
+        val payload = JSONObject(IterableTestUtils.getResourceString("embedded_payload_no_elements_no_custom_payload.json"))
+        val jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS)
+
+        if (jsonArray != null) {
+            // GIVEN an embedded message placement payload with optional elements
+            val placementJson = jsonArray.optJSONObject(0)
+
+            // WHEN you deserialize the embedded message placement payload
+            val placement = IterableEmbeddedPlacement.fromJSONObject(placementJson)
+
+            val message = placement.messages[0]
+
+            // THEN we get appropriate embedded message object and associated placement id
+            assertNotNull(placement)
+            assertThat(411L, `is` (placement.placementId))
+
+            assertThat("doibjo4590340oidiobnw", `is` (message.metadata.messageId))
+            assertThat(411L, `is` (message.metadata.placementId))
+            assertThat(2324,`is` (message.metadata.campaignId))
+            assertThat(true, `is` (message.metadata.isProof))
+
+            assertNull(message.elements)
+            assertNull(message.payload)
+        }
+    }
+
+    @Test
+    fun embeddedPlacementDeserialization_multiplePlacements() {
+        val payload = JSONObject(IterableTestUtils.getResourceString("embedded_payload_multiple_1.json"))
+        val jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS)
+
+        if (jsonArray != null) {
+            // GIVEN an embedded message placement payload with optional elements
+            val placementJson1 = jsonArray.optJSONObject(0)
+            val placementJson2 = jsonArray.optJSONObject(1)
+
+            // WHEN you deserialize the embedded message placement payload
+            val placement1 = IterableEmbeddedPlacement.fromJSONObject(placementJson1)
+            val placement2 = IterableEmbeddedPlacement.fromJSONObject(placementJson2)
+
+            val message1 = placement1.messages[0]
+            val message2 = placement2.messages[0]
+
+            // THEN we get appropriate embedded message object and associated placement id
+            assertNotNull(placement1)
+            assertThat(0L, `is` (placement1.placementId))
+
+            assertThat("doibjo4590340oidiobnw", `is` (message1.metadata.messageId))
+            assertThat(0L, `is` (message1.metadata.placementId))
+            assertThat(2324,`is` (message1.metadata.campaignId))
+            assertThat(true, `is` (message1.metadata.isProof))
+
+            assertThat("Iterable Coffee Shoppe", `is`(message1.elements?.title))
+            assertThat("SAVE 15% OFF NOW", `is` (message1.elements?.body))
+            assertThat("http://placekitten.com/200/300", `is` (message1.elements?.mediaURL))
+
+            assertThat("someType", `is`(message1.elements?.defaultAction?.type))
+            assertThat("someData", `is` (message1.elements?.defaultAction?.data))
+
+            assertThat("reward-button", `is`(message1.elements?.buttons?.get(0)?.id))
+            assertThat("REDEEM MEOW", `is` (message1.elements?.buttons?.get(0)?.title))
+
+            assertThat("body", `is`(message1.elements?.text?.get(0)?.id))
+            assertThat("CATS RULE!!!", `is` (message1.elements?.text?.get(0)?.text))
+            assertThat("label", `is` (message1.elements?.text?.get(0)?.label))
+
+            assertThat("someValue", `is` (message1.payload?.getString("someKey")))
+
+            assertNotNull(placement1)
+            assertThat(1L, `is` (placement2.placementId))
+
+            assertThat("faert442rjasiri99", `is` (message2.metadata.messageId))
+            assertThat(1L, `is` (message2.metadata.placementId))
+            assertThat(132,`is` (message2.metadata.campaignId))
+            assertThat(true, `is` (message2.metadata.isProof))
+
+            assertThat("DEALS DEALS DEALS", `is`(message2.elements?.title))
+            assertThat("ACT NOW! FIRST ONE FREE", `is` (message2.elements?.body))
+            assertThat("http://placekitten.com/200/300", `is` (message2.elements?.mediaURL))
+
+            assertThat("someType", `is`(message2.elements?.defaultAction?.type))
+            assertThat("someData", `is` (message2.elements?.defaultAction?.data))
+
+            assertThat("reward-button", `is`(message2.elements?.buttons?.get(0)?.id))
+            assertThat("REDEEM MEOW", `is` (message2.elements?.buttons?.get(0)?.title))
+
+            assertThat("body", `is`(message2.elements?.text?.get(0)?.id))
+            assertThat("CATS RULE!!!", `is` (message2.elements?.text?.get(0)?.text))
+            assertThat("label", `is` (message2.elements?.text?.get(0)?.label))
+
+            assertThat("someValue", `is` (message2.payload?.getString("someKey")))
+        }
+    }
+
+    @Test
+    fun embeddedPlacementSerialization_elementsAndCustomPayloadDefined() {
+        val embeddedMessageMetadata = EmbeddedMessageMetadata(
+            "doibjo4590340oidiobnw",
+            411L,
+            2324,
+            true
+        )
+
+        val embeddedMessageDefaultAction = EmbeddedMessageElementsDefaultAction(
+            "someType", "someData"
+        )
+
+        val embeddedMessageElementsButtonAction = EmbeddedMessageElementsButtonAction(
+            "openUrl", "https://www.google.com"
+        )
+
+        val embeddedMessageButtons: List<EmbeddedMessageElementsButton> = listOf(
+            EmbeddedMessageElementsButton("reward-button", "REDEEM MEOW", embeddedMessageElementsButtonAction)
+        )
+
+        val embeddedMessageText: List<EmbeddedMessageElementsText> = listOf(
+            EmbeddedMessageElementsText("body", "CATS RULE!!!", "label")
+        )
+
+        val embeddedMessageElements = EmbeddedMessageElements(
+            "Iterable Coffee Shoppe",
+            "SAVE 15% OFF NOW",
+            "http://placekitten.com/200/300",
+            "Cappuccino art of a cat",
+            embeddedMessageDefaultAction,
+            embeddedMessageButtons,
+            embeddedMessageText
+        )
+
+        val customPayload = JSONObject()
+        customPayload.put("someKey", "someValue")
+
+        val embeddedMessage = IterableEmbeddedMessage(embeddedMessageMetadata, embeddedMessageElements, customPayload)
+
+        val placementId: Long = 411L
+        val messages: List<IterableEmbeddedMessage> = listOf(embeddedMessage)
+
+        val embeddedMessagePlacement = IterableEmbeddedPlacement(placementId, messages)
+
+        val payload = JSONObject(IterableTestUtils.getResourceString("embedded_payload_optional_elements_and_custom_payload.json"))
+        val jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS)
+
+        if (jsonArray != null) {
+            // GIVEN an embedded message placement payload
+            val expectedPlacementJson = jsonArray.optJSONObject(0)
+
+            // WHEN you serialize the embedded message payload
+            val placementJson = IterableEmbeddedPlacement.toJSONObject(embeddedMessagePlacement)
+
+            // THEN we get appropriate embedded message object
+            JSONAssert.assertEquals(expectedPlacementJson, placementJson, JSONCompareMode.STRICT_ORDER)
+        }
+    }
+
+    @Test
+    fun embeddedPlacementSerialization_noButtons_noText() {
+        val embeddedMessageMetadata = EmbeddedMessageMetadata(
+            "doibjo4590340oidiobnw",
+            411L,
+            2324,
+            true
+        )
+
+        val embeddedMessageDefaultAction = EmbeddedMessageElementsDefaultAction(
+            "someType", "someData"
+        )
+
+        val embeddedMessageElements = EmbeddedMessageElements(
+            "Iterable Coffee Shoppe",
+            "SAVE 15% OFF NOW",
+            "http://placekitten.com/200/300",
+            "Cappuccino art of a cat",
+            embeddedMessageDefaultAction
+        )
+
+        val customPayload = JSONObject()
+        customPayload.put("someKey", "someValue")
+
+        val embeddedMessage = IterableEmbeddedMessage(embeddedMessageMetadata, embeddedMessageElements, customPayload)
+
+        val placementId: Long = 411L
+        val messages: List<IterableEmbeddedMessage> = listOf(embeddedMessage)
+
+        val embeddedMessagePlacement = IterableEmbeddedPlacement(placementId, messages)
+
+        val payload = JSONObject(IterableTestUtils.getResourceString("embedded_payload_no_buttons_no_text.json"))
+        val jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE)
+
+        if (jsonArray != null) {
+            // GIVEN an embedded message placement payload
+            val expectedPlacementJson = jsonArray.optJSONObject(0)
+
+            // WHEN you serialize the embedded message payload
+            val placementJson = IterableEmbeddedPlacement.toJSONObject(embeddedMessagePlacement)
+
+            // THEN we get appropriate embedded message object
+            JSONAssert.assertEquals(expectedPlacementJson, placementJson, JSONCompareMode.STRICT_ORDER)
+        }
+    }
+
+    @Test
+    fun embeddedPlacementSerialization_multiplePlacements() {
+        val embeddedMessageMetadata1 = EmbeddedMessageMetadata(
+            "ewsd3fdrtj6ty",
+            1L,
+            19853,
+            true
+        )
+
+        val embeddedMessageDefaultAction1 = EmbeddedMessageElementsDefaultAction(
+            "someType", "someData"
+        )
+
+        val embeddedMessageElementsButtonAction1 = EmbeddedMessageElementsButtonAction(
+            "openUrl", "https://www.google.com"
+        )
+
+        val embeddedMessageButtons1: List<EmbeddedMessageElementsButton> = listOf(
+            EmbeddedMessageElementsButton("reward-button", "REDEEM MEOW", embeddedMessageElementsButtonAction1)
+        )
+
+        val embeddedMessageText1: List<EmbeddedMessageElementsText> = listOf(
+            EmbeddedMessageElementsText("body", "CATS RULE!!!", "label")
+        )
+
+        val embeddedMessageElements1 = EmbeddedMessageElements(
+            "Subscribe to the newsletter",
+            "Learn all about colorado kittens",
+            "http://placekitten.com/200/300",
+            "Cappuccino art of a cat",
+            embeddedMessageDefaultAction1,
+            embeddedMessageButtons1,
+            embeddedMessageText1
+        )
+
+        val customPayload1 = JSONObject()
+        customPayload1.put("someKey", "someValue")
+
+        val embeddedMessage1 = IterableEmbeddedMessage(embeddedMessageMetadata1, embeddedMessageElements1, customPayload1)
+
+        val placementId1: Long = 1
+        val messages1: List<IterableEmbeddedMessage> = listOf(embeddedMessage1)
+
+        val embeddedMessagePlacement1 = IterableEmbeddedPlacement(placementId1, messages1)
+
+        val embeddedMessageMetadata2 = EmbeddedMessageMetadata(
+            "grewdvb54ut87y",
+            2,
+            1910,
+            true
+        )
+
+        val embeddedMessageDefaultAction2 = EmbeddedMessageElementsDefaultAction(
+            "someType", "someData"
+        )
+
+        val embeddedMessageElementsButtonAction2 = EmbeddedMessageElementsButtonAction(
+            "openUrl", "https://www.google.com"
+        )
+
+        val embeddedMessageButtons2: List<EmbeddedMessageElementsButton> = listOf(
+            EmbeddedMessageElementsButton("reward-button", "REDEEM MEOW", embeddedMessageElementsButtonAction2)
+        )
+
+        val embeddedMessageText2: List<EmbeddedMessageElementsText> = listOf(
+            EmbeddedMessageElementsText("body", "CATS RULE!!!", "label")
+        )
+
+        val embeddedMessageElements2 = EmbeddedMessageElements(
+            "Experience the great outdoors",
+            "Trips are going fast!",
+            "http://placekitten.com/200/300",
+            "Cappuccino art of a cat",
+            embeddedMessageDefaultAction2,
+            embeddedMessageButtons2,
+            embeddedMessageText2
+        )
+
+        val customPayload2 = JSONObject()
+        customPayload2.put("someKey", "someValue")
+
+        val embeddedMessage2 = IterableEmbeddedMessage(embeddedMessageMetadata2, embeddedMessageElements2, customPayload2)
+
+        val placementId2: Long = 2
+        val messages2: List<IterableEmbeddedMessage> = listOf(embeddedMessage2)
+
+        val embeddedMessagePlacement2 = IterableEmbeddedPlacement(placementId2, messages2)
+
+        val payload = JSONObject(IterableTestUtils.getResourceString("embedded_payload_multiple_2.json"))
+        val jsonArray = payload.optJSONArray(IterableConstants.ITERABLE_EMBEDDED_MESSAGE_PLACEMENTS)
+
+        if (jsonArray != null) {
+            // GIVEN an embedded message placement payload
+            val expectedPlacementJson1 = jsonArray.optJSONObject(0)
+            val expectedPlacementJson2 = jsonArray.optJSONObject(1)
+
+            // WHEN you serialize the embedded message payload
+            val placementJson1 = IterableEmbeddedPlacement.toJSONObject(embeddedMessagePlacement1)
+            val placementJson2 = IterableEmbeddedPlacement.toJSONObject(embeddedMessagePlacement2)
+
+            // THEN we get appropriate embedded message object
+            JSONAssert.assertEquals(expectedPlacementJson1, placementJson1, JSONCompareMode.STRICT_ORDER)
+            JSONAssert.assertEquals(expectedPlacementJson2, placementJson2, JSONCompareMode.STRICT_ORDER)
+        }
+    }
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/java/com/iterable/iterableapi/IterableFirebaseMessagingServiceTest.java b/iterableapi/src/test/java/com/iterable/iterableapi/IterableFirebaseMessagingServiceTest.java
index 25771de1d..9cb5ef0b8 100644
--- a/iterableapi/src/test/java/com/iterable/iterableapi/IterableFirebaseMessagingServiceTest.java
+++ b/iterableapi/src/test/java/com/iterable/iterableapi/IterableFirebaseMessagingServiceTest.java
@@ -128,4 +128,14 @@ public void testIsGhostPushWithNotificationMessage() throws Exception {
         verify(notificationHelperSpy).isGhostPush(any(Bundle.class));
     }
 
+    @Test
+    public void testUpdateMessagesIsCalled() throws Exception {
+        IterableEmbeddedManager embeddedManagerSpy = spy(IterableApi.getInstance().getEmbeddedManager());
+        when(apiMock.getEmbeddedManager()).thenReturn(embeddedManagerSpy);
+
+        RemoteMessage.Builder builder = new RemoteMessage.Builder("1234@gcm.googleapis.com");
+        builder.setData(IterableTestUtils.getMapFromJsonResource("push_payload_embedded_update.json"));
+        controller.get().onMessageReceived(builder.build());
+        verify(embeddedManagerSpy).syncMessages();
+    }
 }
diff --git a/iterableapi/src/test/java/com/iterable/iterableapi/IterableTestUtils.java b/iterableapi/src/test/java/com/iterable/iterableapi/IterableTestUtils.java
index 22113c483..64cd18afa 100644
--- a/iterableapi/src/test/java/com/iterable/iterableapi/IterableTestUtils.java
+++ b/iterableapi/src/test/java/com/iterable/iterableapi/IterableTestUtils.java
@@ -42,8 +42,8 @@ public static void createIterableApiNew(ConfigBuilderExtender extender) {
 
     public static void createIterableApiNew(ConfigBuilderExtender extender, String email) {
         IterableConfig.Builder builder = new IterableConfig.Builder()
-                .setAutoPushRegistration(false);
-
+                .setAutoPushRegistration(false)
+                .setEnableEmbeddedMessaging(true);
         if (extender != null) {
             builder = extender.run(builder);
         }
diff --git a/iterableapi/src/test/resources/embedded_payload_bad_api_key.json b/iterableapi/src/test/resources/embedded_payload_bad_api_key.json
new file mode 100644
index 000000000..06eba9bac
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_bad_api_key.json
@@ -0,0 +1,8 @@
+{
+  "msg": "Invalid API key",
+  "code": "BadApiKey",
+  "params": {
+    "ip": "174.29.133.166",
+    "endpoint": "\/api\/inApp\/getMessages"
+  }
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_empty.json b/iterableapi/src/test/resources/embedded_payload_empty.json
new file mode 100644
index 000000000..aa99468ed
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_empty.json
@@ -0,0 +1,3 @@
+{
+  "placements": []
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_multiple_1.json b/iterableapi/src/test/resources/embedded_payload_multiple_1.json
new file mode 100644
index 000000000..ea1d967bb
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_multiple_1.json
@@ -0,0 +1,80 @@
+{
+  "placements": [
+    {
+      "placementId": 0,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "doibjo4590340oidiobnw",
+            "placementId": 0,
+            "campaignId": 2324,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Iterable Coffee Shoppe",
+            "body": "SAVE 15% OFF NOW",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    },
+    {
+      "placementId": 1,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "faert442rjasiri99",
+            "placementId": 1,
+            "campaignId": 132,
+            "isProof": true
+          },
+          "elements": {
+            "title": "DEALS DEALS DEALS",
+            "body": "ACT NOW! FIRST ONE FREE",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_multiple_2.json b/iterableapi/src/test/resources/embedded_payload_multiple_2.json
new file mode 100644
index 000000000..09fe73e05
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_multiple_2.json
@@ -0,0 +1,80 @@
+{
+  "placements": [
+    {
+      "placementId": 1,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "ewsd3fdrtj6ty",
+            "placementId": 1,
+            "campaignId": 19853,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Subscribe to the newsletter",
+            "body": "Learn all about colorado kittens",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    },
+    {
+      "placementId": 2,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "grewdvb54ut87y",
+            "placementId": 2,
+            "campaignId": 1910,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Experience the great outdoors",
+            "body": "Trips are going fast!",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_multiple_3.json b/iterableapi/src/test/resources/embedded_payload_multiple_3.json
new file mode 100644
index 000000000..0fd4806f1
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_multiple_3.json
@@ -0,0 +1,113 @@
+{
+  "placements": [
+    {
+      "placementId": 0,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "doibjo4590340oidiobnw",
+            "placementId": 0,
+            "campaignId": 2324,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Iterable Coffee Shoppe",
+            "body": "SAVE 15% OFF NOW",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        },
+        {
+          "metadata": {
+            "messageId": "gret45ydkht5fewty",
+            "placementId": 0,
+            "campaignId": 2326,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Ski Chalet at Copper Mountain",
+            "body": "THE SEASON IS NOW",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    },
+    {
+      "placementId": 1,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "faert442rjasiri99",
+            "placementId": 1,
+            "campaignId": 132,
+            "isProof": true
+          },
+          "elements": {
+            "title": "DEALS DEALS DEALS",
+            "body": "ACT NOW! FIRST ONE FREE",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_no_buttons_no_text.json b/iterableapi/src/test/resources/embedded_payload_no_buttons_no_text.json
new file mode 100644
index 000000000..48c915913
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_no_buttons_no_text.json
@@ -0,0 +1,29 @@
+{
+  "placements": [
+    {
+      "placementId": 411,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "doibjo4590340oidiobnw",
+            "placementId": 411,
+            "campaignId": 2324,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Iterable Coffee Shoppe",
+            "body": "SAVE 15% OFF NOW",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            }
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_no_custom_payload.json b/iterableapi/src/test/resources/embedded_payload_no_custom_payload.json
new file mode 100644
index 000000000..5b359d361
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_no_custom_payload.json
@@ -0,0 +1,39 @@
+{
+  "placements": [
+    {
+      "placementId": 411,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "doibjo4590340oidiobnw",
+            "placementId": 411,
+            "campaignId": 2324,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Iterable Coffee Shoppe",
+            "body": "SAVE 15% OFF NOW",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_no_elements_no_custom_payload.json b/iterableapi/src/test/resources/embedded_payload_no_elements_no_custom_payload.json
new file mode 100644
index 000000000..328cc7896
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_no_elements_no_custom_payload.json
@@ -0,0 +1,17 @@
+{
+  "placements": [
+    {
+      "placementId": 411,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "doibjo4590340oidiobnw",
+            "placementId": 411,
+            "campaignId": 2324,
+            "isProof": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_optional_elements_and_custom_payload.json b/iterableapi/src/test/resources/embedded_payload_optional_elements_and_custom_payload.json
new file mode 100644
index 000000000..2f1ebbd9a
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_optional_elements_and_custom_payload.json
@@ -0,0 +1,42 @@
+{
+  "placements": [
+    {
+      "placementId": 411,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "doibjo4590340oidiobnw",
+            "placementId": 411,
+            "campaignId": 2324,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Iterable Coffee Shoppe",
+            "body": "SAVE 15% OFF NOW",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_single_1.json b/iterableapi/src/test/resources/embedded_payload_single_1.json
new file mode 100644
index 000000000..fb08627dc
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_single_1.json
@@ -0,0 +1,42 @@
+{
+  "placements": [
+    {
+      "placementId": 0,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "doibjo4590340oidiobnw",
+            "placementId": 0,
+            "campaignId": 2324,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Iterable Coffee Shoppe",
+            "body": "SAVE 15% OFF NOW",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/embedded_payload_single_2.json b/iterableapi/src/test/resources/embedded_payload_single_2.json
new file mode 100644
index 000000000..94cd1099f
--- /dev/null
+++ b/iterableapi/src/test/resources/embedded_payload_single_2.json
@@ -0,0 +1,42 @@
+{
+  "placements": [
+    {
+      "placementId": 1,
+      "embeddedMessages": [
+        {
+          "metadata": {
+            "messageId": "dffe4fgfrews3f",
+            "placementId": 1,
+            "campaignId": 2324,
+            "isProof": true
+          },
+          "elements": {
+            "title": "Iterable Coffee Shoppe",
+            "body": "SAVE 15% OFF NOW",
+            "mediaUrl": "http://placekitten.com/200/300",
+            "defaultAction": {
+              "type": "someType",
+              "data": "someData"
+            },
+            "buttons": [{
+              "id": "reward-button",
+              "title": "REDEEM MEOW",
+              "action": {
+                "type": "openUrl",
+                "data": "https://www.google.com"
+              }
+            }],
+            "text": [{
+              "id": "body",
+              "text": "CATS RULE!!!",
+              "label": "label"
+            }]
+          },
+          "payload": {
+            "someKey": "someValue"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/iterableapi/src/test/resources/push_payload_embedded_update.json b/iterableapi/src/test/resources/push_payload_embedded_update.json
new file mode 100644
index 000000000..8a7bf4648
--- /dev/null
+++ b/iterableapi/src/test/resources/push_payload_embedded_update.json
@@ -0,0 +1,7 @@
+{
+  "itbl": {
+    "messageId": "BACKGROUND_NOTIFICATION",
+    "isGhostPush": true
+  },
+  "notificationType": "UpdateEmbedded"
+}
\ No newline at end of file
diff --git a/sample-apps/inbox-customization/app/build.gradle b/sample-apps/inbox-customization/app/build.gradle
index 1638bfc3a..e831956af 100644
--- a/sample-apps/inbox-customization/app/build.gradle
+++ b/sample-apps/inbox-customization/app/build.gradle
@@ -33,8 +33,8 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
     implementation 'com.google.android.material:material:1.1.0'
 
-    implementation 'com.iterable:iterableapi:3.4.17'
-    implementation 'com.iterable:iterableapi-ui:3.4.17'
+    implementation 'com.iterable:iterableapi:3.5.0-beta1'
+    implementation 'com.iterable:iterableapi-ui:3.5.0-beta1'
     implementation 'com.squareup.okhttp3:mockwebserver:4.2.2'
 
     testImplementation 'junit:junit:4.12'